Merge pull request #260 from migueldvb/tests

Add support for astropy stable

Author: mkelley

.travis.yml

@@ -50,7 +50,7 @@ jobs:
           stage: Tests with various Astropy/Numpy versions
           env: PYTHON_VERSION=3.7
                NUMPY_VERSION=1.18
-               ASTROPY_VERSION=3
+               ASTROPY_VERSION=4
 
         # Test docs and PEP8
         - os: linux

docs/sbpy/spectroscopy/sources.rst

@@ -28,8 +28,8 @@ Observe the source through a fictitious 10-μm filter:
 
   >>> from synphot import SpectralElement, Box1D
   >>> N = SpectralElement(Box1D, x_0=10.5 * u.um, width=1 * u.um)
-  >>> print(B.observe(N, unit='MJy'))
-  783576416.2276517 MJy
+  >>> print(B.observe(N, unit='MJy'))  # doctest: +FLOAT_CMP
+  783577717.2783749 MJy
 
 Observe the source through a low-resolution spectrometer:
 

sbpy/activity/dust.py

@@ -20,6 +20,7 @@
 
 import numpy as np
 import astropy.units as u
+from astropy.utils.misc import InheritDocstrings
 
 from .. import bib
 from ..calib import Sun
@@ -163,11 +164,17 @@ def phase_HalleyMarcus(phase):
     return Phi
 
 
-class DustComaQuantityMeta(type(u.SpecificTypeQuantity), abc.ABCMeta):
-    pass
+# checks if the installed astropy version is up-to-date
+if isinstance(u.SpecificTypeQuantity, InheritDocstrings):
+    # astropy < 4.0
+    class DustComaQuantityMeta(InheritDocstrings, abc.ABCMeta):
+        pass
+else:
+    # astropy >= 4.0
+    DustComaQuantityMeta = abc.ABCMeta
 
 
-class DustComaQuantity(u.SpecificTypeQuantity, abc.ABC,
+class DustComaQuantity(u.SpecificTypeQuantity,
                        metaclass=DustComaQuantityMeta):
     """Abstract base class for dust coma photometric models: Afrho, Efrho.
     """

sbpy/photometry/hapke.py

@@ -36,11 +36,11 @@ github_project = NASA-Planetary-Science/sbpy
 [options]
 install_requires =
     numpy>=1.13.0
-    astropy>=3.0,<4.0
+    astropy>=3.0
     astropy-helpers
     matplotlib
     ads
-    synphot<0.2
+    synphot
     astroquery>=0.4.1.dev0
 
 [options.extras_require]