MAINT: some deprecation consistency cleanup

Author: bsipocz

astroquery/cds/__init__.py

@@ -20,10 +20,12 @@
 
 # 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/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."):

setup.cfg

@@ -58,12 +58,14 @@ 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
 # 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 =