Merge branch 'main' into noirlab-archive

* main: (95 commits)
  Update change log
  Add interstellar object and dead comet tests.
  Rearrange regex comments
  Allow "dead" comets like 85D
  Use I for interstellar objects, P for periodic comets.
  Numbers are not allowed in fragment designations.
  I/ is not a valid prefix.
  1A, 2A, etc. are not valid objects.
  Update comments to clarify what the code is doing
  Clarify object reassignment.
  Bump the actions group with 2 updates
  maint: switch to the new cds domain name
  fix: remove message when regions is missing
  add changes entry
  remove UCD formatter
  Address review comments from Sam Bianco
  enforce upper limit on MastMissions query radius
  DOC: fix more syntax [skip ci]
  BUG: fix usage of contentless directives
  EUCLIDSWRQ-270: Configure response for get_datalinks with metadata option
  ...

Author: weaverba137

.github/workflows/ci_crontests.yml

@@ -36,11 +36,11 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c  # v6.0.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548  # v6.1.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies

.github/workflows/ci_devtests.yml

@@ -44,11 +44,11 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c  # v6.0.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548  # v6.1.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies

.github/workflows/ci_online_crontests.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c  # v6.0.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548  # v6.1.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies

.github/workflows/ci_tests.yml

@@ -63,11 +63,11 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c  # v6.0.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548  # v6.1.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies
@@ -85,11 +85,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c  # v6.0.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548  # v6.1.0
       with:
         python-version: "3.9"
     - name: Run egg_info

.github/workflows/codeql-analysis.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3  # v6.0.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

CHANGES.rst

@@ -9,11 +9,28 @@ New Tools and Services
 API changes
 -----------
 
+esa.euclid
+^^^^^^^^^^
+
+- Method ``get_datalinks`` has a new argument, ``extra_options``, to customize the results to be got
+  from the server. Specifically, passing ``'METADATA'`` to this argument will retrieve the extra fields
+  ``datalabs_path``, ``file_name`` and ``hdu_index``. [#3438]
+
+vizier
+^^^^^^
+- Methods ``get_catalog``, ``get_catalog_async`` and ``query_*`` now always return UCD1+ instead of UCD1. [#3458]
 
 
 Service fixes and enhancements
 ------------------------------
 
+heasarc
+^^^^^^^
+- Add ``query_constraints`` to allow querying of different catalog columns. [#3403]
+- Add support for uploading tables when using TAP directly through ``query_tap``. [#3403]
+- Add automatic guessing for the data host in ``download_data``. [#3403]
+
+
 esa.hubble
 ^^^^^^^^^^
 
@@ -30,12 +47,38 @@ mast
 
 - Switch to use HTTP continuation for partial downloads. [#3448]
 
+- Expand the supported data types for filter values in ``Mast.mast_query``. Previously, users had to input
+  filter values enclosed in lists, even when specifying a single value or dictionary. [#3422]
+
+- Raise informative error if ``MastMissions`` query radius is too large. [#3447]
+
+jplspec
+^^^^^^^
+
+- Moved to linelists/.  astroquery.jplspec is now deprecated in favor of astroquery.linelists.jplspec [#3455]
+
+linelists.jplspec
+^^^^^^^^^^^^^^^^^
+
+- New location for jplspec.  astroquery.jplspec is now deprecated in favor of astroquery.linelists.jplspec [#3455]
+
+mpc
+^^^
+
+- Fix bug in queries for interstellar objects with `MPC.get_observations` and enable queries for "dead" comets [#3474]
+
 noirlab
 ^^^^^^^
 
 - Restore access to the `NSF NOIRLab <https://noirlab.edu>`_
   `Astro Data Archive <https://astroarchive.noirlab.edu>`_ [#3359].
 
+xmatch
+^^^^^^
+
+- change url of xmatch to use the new CDS domain name [#3465]
+
+
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------
 
@@ -58,6 +101,11 @@ esa.hubble
 - Removal of the deprecated ``query_hst_tap`` method, use ``query_tap`` instead.
   [#3367]
 
+eso
+^^^
+
+- Deprecated ``open_form`` and ``cache`` in query functions [#3339]
+
 gaia
 ^^^^
 
@@ -96,6 +144,15 @@ esa.hubble
 
 - Internal refactor of the module to use to PyVO. [#3367]
 
+eso
+^^^
+
+- Switch querying interface from WDB to TAP in querying functions. [#3339]
+- Allow plain ADQL queries via ``query_tap`` (with authentication as well). [#3339]
+- Cone search using ``cone_ra`, ``cone_dec`, ``cone_radius`` arguments. [#3339]
+- Retrieve record count before querying the archive, via ``count_only`` argument. [#3339]
+- Ask query functions to print the underlying ADQL queries without issuing them. [#3339]
+
 gaia
 ^^^^
 
@@ -158,6 +215,7 @@ linelists.cdms
 
 - Add a keyword to control writing of new species cache files.
   This is needed to prevent tests from overwriting those files. [#3297]
+- Add more complete support for CDMS quantum number and other value parsing. [#3302]
 
 mast
 ^^^^

astroquery/esa/euclid/core.py

@@ -1418,8 +1418,11 @@ def get_spectrum(self, *, source_id, schema='sedm', retrieval_type="ALL", output
 
         return files
 
-    def get_datalinks(self, ids, *, linking_parameter='SOURCE_ID', verbose=False):
-        """Gets datalinks associated to the provided identifiers
+    def get_datalinks(self, ids, *, linking_parameter='SOURCE_ID', extra_options=None, verbose=False):
+        """
+        Description
+        -----------
+        Gets datalinks associated to the provided identifiers.
         TAP+ only
 
         Parameters
@@ -1428,6 +1431,9 @@ def get_datalinks(self, ids, *, linking_parameter='SOURCE_ID', verbose=False):
             list of identifiers
         linking_parameter : str, optional, default SOURCE_ID, valid values: SOURCE_ID
             By default, all the identifiers are considered as source_id
+        extra_options : str, optional, default None, valid values: METADATA
+            To let customize the server behaviour, if present.
+            If provided with value METADATA, the extra fields datalabs_path, file_name & hdu_index will be retrieved.
         verbose : bool, optional, default 'False'
             flag to display information about the process
 
@@ -1437,7 +1443,10 @@ def get_datalinks(self, ids, *, linking_parameter='SOURCE_ID', verbose=False):
 
         """
 
-        return self.__eucliddata.get_datalinks(ids=ids, linking_parameter=linking_parameter, verbose=verbose)
+        return self.__eucliddata.get_datalinks(ids=ids,
+                                               linking_parameter=linking_parameter,
+                                               extra_options=extra_options,
+                                               verbose=verbose)
 
     def get_scientific_product_list(self, *, observation_id=None, tile_index=None, category=None, group=None,
                                     product_type=None, dataset_release='REGREPROC1_R2', verbose=False):

astroquery/esa/euclid/tests/test_euclidtap.py

@@ -1220,19 +1220,36 @@ def test_logout(mock_logout):
 
 
 def test_get_datalinks(monkeypatch):
-    def get_datalinks_monkeypatched(self, ids, linking_parameter, verbose):
+    def get_datalinks_monkeypatched(self, ids, linking_parameter, extra_options, verbose):
         return Table()
 
     # `EuclidClass` is a subclass of `TapPlus`, but it does not inherit
     # `get_datalinks()`, it replaces it with a call to the `get_datalinks()`
-    # of its `__gaiadata`.
+    # of its `__eucliddata`.
     monkeypatch.setattr(TapPlus, "get_datalinks", get_datalinks_monkeypatched)
     euclid = EuclidClass(show_server_messages=False)
 
     result = euclid.get_datalinks(ids=[12345678], verbose=True)
     assert isinstance(result, Table)
 
 
+def test_get_datalinks_with_metadata(monkeypatch):
+    def get_datalinks_monkeypatched(self, ids, linking_parameter, extra_options, verbose):
+        table = TapTableMeta()
+        table.name = extra_options
+        return table
+
+    # `EuclidClass` is a subclass of `TapPlus`, but it does not inherit
+    # `get_datalinks()`, it replaces it with a call to the `get_datalinks()`
+    # of its `__eucliddata`.
+    monkeypatch.setattr(TapPlus, "get_datalinks", get_datalinks_monkeypatched)
+    euclid = EuclidClass(show_server_messages=False)
+
+    result = euclid.get_datalinks(ids=[12345678], extra_options='METADATA')
+    assert isinstance(result, TapTableMeta)
+    assert result.name == "METADATA"
+
+
 @pytest.mark.parametrize("background", [False, True])
 def test_cross_match_basic(monkeypatch, background, cross_match_basic_kwargs, mock_querier_async):
     def load_table_monkeypatched(self, table, verbose):

astroquery/eso/__init__.py

@@ -10,15 +10,15 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.eso`.
     """
 
-    row_limit = _config.ConfigItem(
-        50,
+    ROW_LIMIT = _config.ConfigItem(
+        1000,
         'Maximum number of rows returned (set to -1 for unlimited).')
     username = _config.ConfigItem(
         "",
         'Optional default username for ESO archive.')
-    query_instrument_url = _config.ConfigItem(
-        "http://archive.eso.org/wdb/wdb/eso",
-        'Root query URL for main and instrument queries.')
+    tap_url = _config.ConfigItem(
+        "https://archive.eso.org/tap_obs",
+        'URL for TAP queries.')
 
 
 conf = Conf()