Skip to content

Commit 8762398

Browse files
authored
Merge pull request #3162 from bsipocz/MAINT_remove_dace
MAINT: remove dace module
2 parents 45b93c0 + fbf55b0 commit 8762398

File tree

11 files changed

+17
-276
lines changed

11 files changed

+17
-276
lines changed

CHANGES.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ casda
3131

3232
- Support jobs which are in the SUSPENDED state (used when copying data) [#3134]
3333

34+
dace
35+
^^^^
36+
37+
- Module has been removed as it was incompatible with server changes. A
38+
standalone library called dace-query is available to access DACE
39+
data. [#3162]
40+
3441
esa.hubble
3542
^^^^^^^^^^
3643

astroquery/dace/__init__.py

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,9 @@
44
Dace API
55
--------
66
7-
:author: Julien Burnier ([email protected])
7+
This module has beeen removed due to upstream changes and in favour of the
8+
standalone dace-query package.
89
"""
910

10-
from astropy import config as _config
11-
12-
13-
class Conf(_config.ConfigNamespace):
14-
"""
15-
Configuration parameters for `astroquery.dace`.
16-
"""
17-
server = _config.ConfigItem(
18-
['https://dace-api.unige.ch/'],
19-
'Dace')
20-
21-
timeout = _config.ConfigItem(
22-
30,
23-
'Time limit for connecting to DACE server.')
24-
25-
26-
conf = Conf()
27-
28-
from .core import Dace, DaceClass
29-
30-
__all__ = ['Dace', 'DaceClass',
31-
'Conf', 'conf',
32-
]
11+
raise ImportError("The DACE module has been removed from astroquery due to server-side "
12+
"changes. Use the standalone dace-query package to access DACE data.")

astroquery/dace/core.py

Lines changed: 0 additions & 78 deletions
This file was deleted.

astroquery/dace/tests/__init__.py

Whitespace-only changes.

astroquery/dace/tests/data/parameter_list.json

Lines changed: 0 additions & 62 deletions
This file was deleted.

astroquery/dace/tests/setup_package.py

Lines changed: 0 additions & 9 deletions
This file was deleted.

astroquery/dace/tests/test_dace.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

astroquery/dace/tests/test_dace_remote.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/dace/dace.rst

Lines changed: 0 additions & 52 deletions
This file was deleted.

docs/index.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ queries based on coordinates or object names. Some simple examples, using SIMBA
142142
>>> result_table = Simbad.query_object("m1")
143143
>>> result_table.pprint()
144144
main_id ra dec coo_err_maj coo_err_min coo_err_angle coo_wavelength coo_bibcode matched_id
145-
deg deg mas mas deg
145+
deg deg mas mas deg
146146
------- ------- ------- ----------- ----------- ------------- -------------- ------------------- ----------
147147
M 1 83.6324 22.0174 5000.0 5000.0 90 X 2022A&A...661A..38P M 1
148148

@@ -156,8 +156,8 @@ All query tools allow coordinate-based queries:
156156
>>> r = 5 * u.arcminute
157157
>>> result_table = Simbad.query_region(c, radius=r)
158158
>>> result_table.pprint(show_unit=True, max_width=80, max_lines=5)
159-
main_id ra ... coo_bibcode
160-
deg ...
159+
main_id ra ... coo_bibcode
160+
deg ...
161161
---------------------------- -------------- ... -------------------
162162
ALMA J053514.4142-052220.792 83.8100591667 ... 2023MNRAS.522...56V
163163
... ... ... ...
@@ -182,7 +182,7 @@ uncomment the relevant configuration item(s), and insert your desired value(s).
182182

183183

184184
.. _astroquery_cache:
185-
185+
186186
Caching
187187
-------
188188

@@ -222,7 +222,7 @@ Each service's cache is cleared with the ``clear_cache`` function within that se
222222
223223
Astroquery-wide settings
224224
^^^^^^^^^^^^^^^^^^^^^^^^
225-
225+
226226
Whether caching is active and when cached files expire are controlled centrally through the
227227
astroquery ``cache_conf`` module, and shared among all services.
228228
Astroquery uses the Astropy configuration infrastructure, information about
@@ -255,7 +255,6 @@ The following modules have been completed using a common API:
255255
cadc/cadc.rst
256256
casda/casda.rst
257257
linelists/cdms/cdms.rst
258-
dace/dace.rst
259258
esa/hsa/hsa.rst
260259
esa/hubble/hubble.rst
261260
esa/iso/iso.rst

0 commit comments

Comments
 (0)