Use UCDs instead of json for ESA Sky

.github/dependabot.yml

@@ -1,7 +1,18 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
-- package-ecosystem: pip
-  directory: "/"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    groups:
+      actions:
+        patterns:
+          - "*"
+    labels:
+      - "no-changelog-entry-needed"
+      - "infrastructure"

.github/workflows/changelog.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check change log entry
-      uses: scientific-python/action-check-changelogfile@064f2005176e1622e7c2bd9776140406609097d1
+      uses: scientific-python/action-check-changelogfile@1fc669db9618167166d5a16c10282044f51805c0  # 0.3
       env:
         CHANGELOG_FILENAME: CHANGES.rst
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci_crontests.yml

@@ -36,11 +36,11 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3  # v5.2.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@v4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3  # v5.2.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies
@@ -57,6 +57,6 @@ jobs:
       run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
     - name: Upload coverage to codecov
       if: contains(matrix.toxenv,'-cov')
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238  # v4.6.0
       with:
         file: ./coverage.xml

.github/workflows/ci_online_crontests.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3  # v5.2.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies

.github/workflows/ci_tests.yml

@@ -56,11 +56,11 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3  # v5.2.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies
@@ -69,7 +69,7 @@ jobs:
       run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
     - name: Upload coverage to codecov
       if: contains(matrix.toxenv,'-cov')
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238  # v4.6.0
       with:
         file: ./coverage.xml
 
@@ -78,11 +78,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3  # v5.2.0
       with:
         python-version: "3.9"
     - name: Run egg_info

.github/workflows/codeql-analysis.yml

@@ -27,11 +27,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@5618c9fc1e675841ca52c1c6b1304f5255a905a0  # codeql-bundle-v2.19.0
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -42,7 +42,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@5618c9fc1e675841ca52c1c6b1304f5255a905a0  # codeql-bundle-v2.19.0
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -56,4 +56,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@5618c9fc1e675841ca52c1c6b1304f5255a905a0  # codeql-bundle-v2.19.0

CHANGES.rst

@@ -179,6 +179,8 @@ gaia
 
 - Fix method search_async_jobs in the class TapPlus. [#2967]
 
+- New retrieval types for datalink (Gaia DR4 release). [#3110]
+
 jplhorizons
 ^^^^^^^^^^^
 
@@ -203,7 +205,7 @@ mast
 - Present users with an error rather than a warning when nonexistent query criteria are used in ``mast.Observations.query_criteria``
   and ``mast.Catalogs.query_criteria``. [#3084]
 
-- Support for case-insensitive criteria keyword arguments in ``mast.Observations.query_criteria`` and 
+- Support for case-insensitive criteria keyword arguments in ``mast.Observations.query_criteria`` and
   ``mast.Catalogs.query_criteria``. [#3087]
 
 - Added function ``mast.Observations.get_unique_product_list`` to return the unique data products associated with
@@ -215,6 +217,12 @@ mpc
 - Rename ``MPC.get_mpc_object_endpoint`` to ``MPC._get_mpc_object_endpoint`` to
   indicate that it is a private method. [#3089]
 
+xmatch
+^^^^^^
+
+- Fix xmatch query for two local tables. The second table was written over the first one,
+  resulting in a confusing "missing cat1" error. [#3116]
+
 
 0.4.7 (2024-03-08)
 ==================
@@ -800,6 +808,8 @@ esa.esasky
 
 - Added Solar System Object functionality. [#2106]
 
+- Added support for eROSITA downloads. [#3111]
+
 ipac
 ^^^^
 

README.rst

@@ -1,4 +1,4 @@
-`Documentation`_ | Blog_ |  `View on Github`_ |  `Download Stable ZIP`_  |  `Download Stable TAR`_
+`Documentation`_ | `View on Github`_ |  `Download Development ZIP`_
 
 .. image:: https://img.shields.io/pypi/v/astroquery.svg
     :target: https://pypi.org/project/astroquery/#history
@@ -9,7 +9,7 @@
     :alt: Documentation Status
 
 .. image:: https://github.com/astropy/astroquery/workflows/CI/badge.svg
-    :target: https://github.com/astropy/astroquery/actions?query=workflow%3ACI
+    :target: https://github.com/astropy/astroquery/actions?query=workflow%37ACI
     :alt: Github Actions CI Status
 
 .. image:: https://codecov.io/gh/astropy/astroquery/branch/main/graph/badge.svg
@@ -35,26 +35,16 @@ website <https://simbad.cds.unistra.fr/simbad/>`_, use the ``simbad`` sub-packag
     >>> from astroquery.simbad import Simbad
     >>> theta1c = Simbad.query_object('tet01 Ori C')
     >>> theta1c.pprint()
-       main_id          ra           dec      ... coo_wavelength     coo_bibcode       matched_id 
-                       deg           deg      ...                                                 
+       main_id          ra           dec      ... coo_wavelength     coo_bibcode       matched_id
+                       deg           deg      ...
     ------------- ------------- ------------- ... -------------- ------------------- -------------
     * tet01 Ori C 83.8186095697 -5.3897005033 ...              O 2020yCat.1350....0G * tet01 Ori C
 
 Installation and Requirements
 -----------------------------
 
-Astroquery works with Python 3.7 or later.
-As an `astropy`_ affiliate, astroquery requires `astropy`_ version 4.2.1 or later.
-
-astroquery uses the `requests <https://requests.readthedocs.io/en/latest/>`_
-module to communicate with the internet.  `BeautifulSoup
-<https://www.crummy.com/software/BeautifulSoup/>`_ and `html5lib'
-<https://html5lib.readthedocs.io/en/latest/>`_ are needed for HTML parsing for
-some services.  The `keyring <https://pypi.python.org/pypi/keyring>`_ module is
-also required for accessing services that require a login.  These can all be
-installed using `pip <https://pypi.python.org/pypi/pip>`_ or `anaconda
-<https://www.anaconda.com/>`_.  Running the tests requires `curl
-<https://curl.haxx.se/>`_ to be installed.
+Astroquery works with Python 3.9 or later.
+As an `astropy`_ affiliate, astroquery requires `astropy`_ version 5.0 or later.
 
 The latest version of astroquery can be pip installed (note the ``--pre`` for
 picking up released developer versions, and ``-U`` for upgrade):
@@ -124,18 +114,11 @@ looked up at the following `Zenodo page <https://doi.org/10.5281/zenodo.591669>`
 Additional Links
 ----------------
 
-`Download Development ZIP`_  |  `Download Development TAR`_
-
 Maintained by `Adam Ginsburg`_ and `Brigitta Sipocz <https://github.com/bsipocz>`_ (`astropy.astroquery@gmail.com`_)
 
 
 .. _Download Development ZIP: https://github.com/astropy/astroquery/zipball/main
-.. _Download Development TAR: https://github.com/astropy/astroquery/tarball/main
-.. _Download Stable ZIP: https://github.com/astropy/astroquery/zipball/stable
-.. _Download Stable TAR: https://github.com/astropy/astroquery/tarball/stable
 .. _View on Github: https://github.com/astropy/astroquery/
 .. _Documentation: https://astroquery.readthedocs.io
-.. _astropy.astroquery@gmail.com: mailto:astropy.astroquery@gmail.com
 .. _Adam Ginsburg: https://www.adamgginsburg.com
-.. _Blog: http://astropy.org/astroquery-blog
 .. _API: https://astroquery.readthedocs.io/en/latest/api.html