rename cds submodule into mocserver

Author: ManonMarchand

astroquery/cds/__init__.py

@@ -18,27 +18,17 @@
   http://www.ivoa.net/documents/MOC/20140602/REC-MOC-1.0-20140602.pdf
 """
 
-from astropy import config as _config
-
-
-class Conf(_config.ConfigNamespace):
-    """
-    Configuration parameters for ``astroquery.template_module``.
-    """
-    server = _config.ConfigItem(
-        ["http://alasky.unistra.fr/MocServer/query",
-         "http://alaskybis.unistra.fr/MocServer/query"],
-        'Name of the template_module server to use.')
-
-    timeout = _config.ConfigItem(
-        30,
-        'Time limit for connecting to template_module server.')
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+import warnings
 
+warnings.warn("The ``cds`` module has been moved to astroquery.mocserver,"
+              "and ``CdsClass`` has been renamed ``MOCserver``. It means that"
+              " 'from astroquery.cds import cds' became 'from astroquery.mocserver"
+              " import mocserver'. Please update your imports.", DeprecationWarning, stacklevel=2)
 
-conf = Conf()
+from astroquery.mocserver import mocserver, MOCserver
 
-from .core import cds, CdsClass
+cds = mocserver
+CdsClass = MOCserver
 
-__all__ = ['cds', 'CdsClass',
-           'Conf', 'conf',
-           ]
+__all__ = ['mocserver', 'MOCserver', 'cds', 'CdsClass']

astroquery/cds/tests/setup_package.py

@@ -0,0 +1,48 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+CDS MOCServer Query Tool
+------------------------
+
+:Author: Matthieu Baumann ([email protected])
+
+This package is for querying the CDS MOC service, primarily hosted at:
+
+* http://alasky.unistra.fr/MocServer/query
+* http://alaskybis.unistra.fr/MocServer/query (mirror)
+
+Note: If the access to MOCs with the MOCServer tool was helpful for your research,
+the following acknowledgment would be appreciated::
+
+  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
+"""
+
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+
+from astropy import config as _config
+
+
+class Conf(_config.ConfigNamespace):
+    """
+    Configuration parameters for ``astroquery.template_module``.
+    """
+
+    server = _config.ConfigItem(
+        [
+            "http://alasky.unistra.fr/MocServer/query",
+            "http://alaskybis.unistra.fr/MocServer/query",
+        ],
+        "Name of the template_module server to use.",
+    )
+
+    timeout = _config.ConfigItem(
+        30, "Time limit for connecting to template_module server."
+    )
+
+
+conf = Conf()
+
+from .core import mocserver, MOCserver
+
+__all__ = ["Conf", "conf", "mocserver", "MOCserver"]