Working on build errors

gammapy/scripts/tests/test_spectrum_pipe.py

@@ -2,7 +2,8 @@
 from numpy.testing import assert_equal, assert_almost_equal
 from astropy.io import fits
 from astropy.tests.helper import remote_data
-from gammapy.scripts import GammapySpectrumAnalysis
+from astropy.tests.helper import pytest
+from ...scripts import GammapySpectrumAnalysis
 from ...datasets import get_path
 
 try:

gammapy/spectrum/energy.py

@@ -5,6 +5,7 @@
 from astropy.io import fits
 from astropy import log
 from astropy.table import Table
+from astropy.extern import six
 from ..utils.fits import table_to_fits_table
 
 
@@ -45,7 +46,7 @@ def __new__(cls, energy, unit=None, dtype=None, copy=True):
         # Techniques to subclass Quantity taken from astropy.coordinates.Angle
         # see: http://docs.scipy.org/doc/numpy/user/basics.subclassing.html
 
-        if isinstance(energy, basestring):
+        if isinstance(energy, six.string_types):
             val, unit = energy.split()
             energy = float(val)
 

gammapy/spectrum/tests/test_energy.py

@@ -66,6 +66,11 @@ def test_Energy():
     desired = Energy(10, 'TeV')
     assert_equal(actual, desired)
 
+    e_string = u'10 TeV'
+    actual = Energy(e_string)
+    desired = Energy(10, 'TeV')
+    assert_equal(actual, desired)
+
 
 @remote_data
 def test_EnergyBounds():