Merge pull request astropy#3162 from bsipocz/MAINT_remove_dace

MAINT: remove dace module
cds-astro · Jan 3, 2025 · 8762398 · 8762398
2 parents 45b93c0 + fbf55b0
commit 8762398
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 276 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -31,6 +31,13 @@ casda
 
 - Support jobs which are in the SUSPENDED state (used when copying data) [#3134]
 
+dace
+^^^^
+
+- Module has been removed as it was incompatible with server changes. A
+  standalone library called dace-query is available to access DACE
+  data. [#3162]
+
 esa.hubble
 ^^^^^^^^^^
 

diff --git a/astroquery/dace/__init__.py b/astroquery/dace/__init__.py
@@ -4,29 +4,9 @@
 Dace API
 --------
 
-:author: Julien Burnier (julien.burnier@unige.ch)
+This module has beeen removed due to upstream changes and in favour of the
+standalone dace-query package.
 """
 
-from astropy import config as _config
-
-
-class Conf(_config.ConfigNamespace):
-    """
-    Configuration parameters for `astroquery.dace`.
-    """
-    server = _config.ConfigItem(
-        ['https://dace-api.unige.ch/'],
-        'Dace')
-
-    timeout = _config.ConfigItem(
-        30,
-        'Time limit for connecting to DACE server.')
-
-
-conf = Conf()
-
-from .core import Dace, DaceClass
-
-__all__ = ['Dace', 'DaceClass',
-           'Conf', 'conf',
-           ]
+raise ImportError("The DACE module has been removed from astroquery due to server-side "
+                  "changes. Use the standalone dace-query package to access DACE data.")
diff --git a/astroquery/dace/core.py b/astroquery/dace/core.py
diff --git a/astroquery/dace/tests/__init__.py b/astroquery/dace/tests/__init__.py
diff --git a/astroquery/dace/tests/data/parameter_list.json b/astroquery/dace/tests/data/parameter_list.json
diff --git a/astroquery/dace/tests/setup_package.py b/astroquery/dace/tests/setup_package.py
diff --git a/astroquery/dace/tests/test_dace.py b/astroquery/dace/tests/test_dace.py
diff --git a/astroquery/dace/tests/test_dace_remote.py b/astroquery/dace/tests/test_dace_remote.py
diff --git a/docs/dace/dace.rst b/docs/dace/dace.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -142,7 +142,7 @@ queries based on coordinates or object names.  Some simple examples, using SIMBA
     >>> result_table = Simbad.query_object("m1")
     >>> result_table.pprint()
     main_id    ra     dec   coo_err_maj coo_err_min coo_err_angle coo_wavelength     coo_bibcode     matched_id
-              deg     deg       mas         mas          deg                                                   
+              deg     deg       mas         mas          deg
     ------- ------- ------- ----------- ----------- ------------- -------------- ------------------- ----------
       M   1 83.6324 22.0174      5000.0      5000.0            90              X 2022A&A...661A..38P      M   1
 
@@ -156,8 +156,8 @@ All query tools allow coordinate-based queries:
     >>> r = 5 * u.arcminute
     >>> result_table = Simbad.query_region(c, radius=r)
     >>> result_table.pprint(show_unit=True, max_width=80, max_lines=5)
-              main_id                  ra       ...     coo_bibcode    
-                                      deg       ...                    
+              main_id                  ra       ...     coo_bibcode
+                                      deg       ...
     ---------------------------- -------------- ... -------------------
     ALMA J053514.4142-052220.792  83.8100591667 ... 2023MNRAS.522...56V
                              ...            ... ...                 ...
@@ -182,7 +182,7 @@ uncomment the relevant configuration item(s), and insert your desired value(s).
 
 
 .. _astroquery_cache:
- 
+
 Caching
 -------
 
@@ -222,7 +222,7 @@ Each service's cache is cleared with the ``clear_cache`` function within that se
 
 Astroquery-wide settings
 ^^^^^^^^^^^^^^^^^^^^^^^^
-    
+
 Whether caching is active and when cached files expire are controlled centrally through the
 astroquery ``cache_conf`` module, and shared among all services.
 Astroquery uses the Astropy configuration infrastructure, information about
@@ -255,7 +255,6 @@ The following modules have been completed using a common API:
   cadc/cadc.rst
   casda/casda.rst
   linelists/cdms/cdms.rst
-  dace/dace.rst
   esa/hsa/hsa.rst
   esa/hubble/hubble.rst
   esa/iso/iso.rst

diff --git a/setup.cfg b/setup.cfg
@@ -36,7 +36,7 @@ show-response = 1
 
 [tool:pytest]
 minversion = 6.0
-norecursedirs = build docs/_build astroquery/irsa astroquery/nasa_exoplanet_archive astroquery/ned astroquery/ibe astroquery/irsa_dust astroquery/cds astroquery/sha
+norecursedirs = build docs/_build astroquery/irsa astroquery/nasa_exoplanet_archive astroquery/ned astroquery/ibe astroquery/irsa_dust astroquery/cds astroquery/sha astroquery/dace
 testpaths = astroquery docs
 doctest_plus = enabled
 astropy_header = true