Merge pull request #2793 from bsipocz/maint_cleanup_deprecations

MAINT: deprecation maintanence

Author: bsipocz

astroquery/cds/__init__.py

@@ -16,14 +16,19 @@
   This research has made use of the MOCServer, a tool developed at CDS, Strasbourg, France aiming at retrieving
   MOCs/meta-data from known data-sets. MOC is an IVOA standard described in the following paper :
   http://www.ivoa.net/documents/MOC/20140602/REC-MOC-1.0-20140602.pdf
+
+.. deprecated:: 0.4.7
 """
 
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 import warnings
+from astropy.utils.exceptions import AstropyDeprecationWarning
+
 
 warnings.warn("The ``cds`` module has been moved to astroquery.mocserver, "
               "and ``CdsClass`` has been renamed to ``MOCServerClass``. "
-              "Please update your imports.", DeprecationWarning, stacklevel=2)
+              "Please update your imports.", AstropyDeprecationWarning, stacklevel=2)
+
 
 from astroquery.mocserver import MOCServer as cds
 from astroquery.mocserver import MOCServerClass as CdsClass

astroquery/ibe/__init__.py

@@ -1,4 +1,10 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+This is the old namespace for querying the NASA/IPAC Infrared Science Archive Image Server (IBE).
+Please update your imports and use it from astroquery.ipac.irsa.ibe
+
+.. deprecated:: 0.4.4
+"""
 import warnings
 
 warnings.warn("the ``ibe`` module has been moved to astroquery.ipac.irsa.ibe, "

astroquery/irsa/__init__.py

@@ -1,4 +1,10 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+This is the old namespace for querying the NASA/IPAC Infrared Science Archive (IRSA).
+Please update your imports and use it from astroquery.ipac.irsa
+
+.. deprecated:: 0.4.4
+"""
 import warnings
 
 warnings.warn("the ``irsa`` module has been moved to astroquery.ipac.irsa, "

astroquery/irsa_dust/__init__.py

@@ -1,5 +1,10 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+This is the old namespace for querying the NASA/IPAC Infrared Science Archive Dust Reddening Tool.
+Please update your imports and use it from astroquery.ipac.irsa.irsa_dust
 
+.. deprecated:: 0.4.4
+"""
 
 import warnings
 

astroquery/mocserver/tests/test_deprecation.py

@@ -1,9 +1,10 @@
 import pytest
+from astropy.utils.exceptions import AstropyDeprecationWarning
 
 
 def test_raises_deprecation_warning():
     with pytest.raises(
-        DeprecationWarning,
+        AstropyDeprecationWarning,
         match="The ``cds`` module has been moved to astroquery.mocserver, "
               "and ``CdsClass`` has been renamed to ``MOCServerClass``. "
               "Please update your imports."):

astroquery/nasa_exoplanet_archive/__init__.py

@@ -1,4 +1,10 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+This is the old namespace for querying the NASA Exolpanet Archive.
+Please update your imports and use it from astroquery.ipac.nexsci.nasa_exoplanet_archive.
+
+.. deprecated:: 0.4.4
+"""
 import warnings
 
 warnings.warn("the ``nasa_exoplanet_archive`` module has been moved to "

astroquery/ned/__init__.py

@@ -1,4 +1,10 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+This is the old namespace for querying the NASA Extragalactic Database (NED).
+Please update your imports and use it from astroquery.ipac.ned
+
+.. deprecated:: 0.4.4
+"""
 import warnings
 
 warnings.warn("the ``ned`` module has been moved to astroquery.ipac.ned, "

astroquery/sha/__init__.py

@@ -1,6 +1,13 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+This is the old namespace for querying the Spitzer Heritage Archive (SHA).
+Please update your imports and use it from astroquery.ipac.irsa.sha.
+
+.. deprecated:: 0.4.4
+"""
 import warnings
 
+
 warnings.warn("the ``sha`` module has been moved to astroquery.ipac.irsa.sha, "
               "please update your imports.", DeprecationWarning, stacklevel=2)
 

setup.cfg

@@ -58,14 +58,16 @@ filterwarnings =
     ignore:Experimental. Fermi-LAT:UserWarning
     ignore:Experimental. SHA:UserWarning
     ignore:Experimental. OGLE:UserWarning:
-# Warnings from deprecated or known-to-be-broken modules
-    ignore:The legacy NRAO archive this module uses has been retired:UserWarning
+# Warnings from deprecated or known-to-be-broken modules. They have to be listed to make test collection work,
+# Can be removed once the modules are removed.
     ignore:vamdclib could not be imported; the vamdc astroquery module will not work:UserWarning
     ignore:the vamdc astroquery module:astropy.utils.exceptions.AstropyDeprecationWarning
     # exoplanet_orbit_database
     ignore:due to the retirement of its upstream website:astropy.utils.exceptions.AstropyDeprecationWarning
 # Leap second update related warning
     ignore:leap-second auto-update failed:astropy.utils.exceptions.AstropyWarning
+
+
 # Should ignore these for astropy<5.0
     ignore:getName|currentThread:DeprecationWarning:astropy
 markers =