Merge branch 'main' into ESA_euclid_EUCLIDMNGT-1275_LE3_search_capability

Author: cosmoJFH

.github/workflows/ci_crontests.yml

@@ -40,7 +40,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065  # v5.6.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies

.github/workflows/ci_devtests.yml

@@ -48,7 +48,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065  # v5.6.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@0565863a31f2c772f9f0395002a31e3f06189574  # v5.4.0
+      uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d  # v5.4.2
       with:
         file: ./coverage.xml

.github/workflows/ci_online_crontests.yml

@@ -42,7 +42,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065  # v5.6.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies

.github/workflows/ci_tests.yml

@@ -67,7 +67,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065  # v5.6.0
       with:
         python-version: ${{ matrix.python }}
     - name: Install Python dependencies
@@ -76,7 +76,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@0565863a31f2c772f9f0395002a31e3f06189574  # v5.4.0
+      uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d  # v5.4.2
       with:
         file: ./coverage.xml
 
@@ -89,7 +89,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065  # v5.6.0
       with:
         python-version: "3.9"
     - name: Run egg_info

ah_bootstrap.py

@@ -53,7 +53,6 @@
 import pkg_resources
 
 from setuptools import Distribution
-from setuptools.package_index import PackageIndex
 
 # This is the minimum Python version required for astropy-helpers
 __minimum_python_version__ = (3, 5)
@@ -416,12 +415,6 @@ def get_local_directory_dist(self):
                 'The requested path {0!r} for importing {1} does not '
                 'exist, or does not contain a copy of the {1} '
                 'package.'.format(self.path, PACKAGE_NAME))
-        elif self.auto_upgrade and not self.is_submodule:
-            # A version of astropy-helpers was found on the available path, but
-            # check to see if a bugfix release is available on PyPI
-            upgrade = self._do_upgrade(dist)
-            if upgrade is not None:
-                dist = upgrade
 
         return dist
 
@@ -448,13 +441,6 @@ def get_local_file_dist(self):
                 '{2}'.format(PACKAGE_NAME, self.path, str(e)))
             dist = None
 
-        if dist is not None and self.auto_upgrade:
-            # A version of astropy-helpers was found on the available path, but
-            # check to see if a bugfix release is available on PyPI
-            upgrade = self._do_upgrade(dist)
-            if upgrade is not None:
-                dist = upgrade
-
         return dist
 
     def get_index_dist(self):
@@ -588,21 +574,6 @@ def get_option_dict(self, command_name):
 
             raise Exception(msg.format(DIST_NAME, source, repr(e)))
 
-    def _do_upgrade(self, dist):
-        # Build up a requirement for a higher bugfix release but a lower minor
-        # release (so API compatibility is guaranteed)
-        next_version = _next_version(dist.parsed_version)
-
-        req = pkg_resources.Requirement.parse(
-            '{0}>{1},<{2}'.format(DIST_NAME, dist.version, next_version))
-
-        package_index = PackageIndex(index_url=self.index_url)
-
-        upgrade = package_index.obtain(req)
-
-        if upgrade is not None:
-            return self._do_download(version=upgrade.version)
-
     def _check_submodule(self):
         """
         Check if the given path is a git submodule.

astroquery/alma/core.py

@@ -594,6 +594,11 @@ def query_async(self, payload, *, public=True, science=True,
         if science is not None:
             payload['science_observation'] = science
         if public is not None:
+            if 'public_data' in kwargs:
+                warnings.warn("Both public and public_data are set. "
+                              "The ``public`` kwarg takes precedence. "
+                              "If you want ``public_data`` to be respected, "
+                              "set ``public=None``.")
             payload['public_data'] = public
 
         query = _gen_sql(payload)

astroquery/alma/tests/test_alma_utils.py

@@ -97,3 +97,19 @@ def test_footprint_to_reg_pointing(pointing_footprint_str=pointing_footprint_str
     assert actual_reg.center.ra == reg_output[0].center.ra
     assert actual_reg.center.dec == reg_output[0].center.dec
     assert actual_reg.radius == reg_output[0].radius
+
+
+@pytest.mark.skipif(not HAS_REGIONS, reason="regions is required")
+def test_footprint_to_reg_plot(pointing_footprint_str=pointing_footprint_str):
+    reg_output = utils.footprint_to_reg(pointing_footprint_str)
+
+    from astropy.wcs import WCS
+    ww = WCS(naxis=2)
+    ww.wcs.crpix = [250.0, 250.0]
+    ww.wcs.cdelt = [-7.500000005754e-05, 7.500000005754e-05]
+    ww.wcs.ctype = ['RA---SIN', 'DEC--SIN']
+    ww.wcs.crval = [reg_output[0].center.ra.value, reg_output[0].center.dec.value]
+
+    pix_region = reg_output[0].to_pixel(ww)
+    artist = pix_region.as_artist()
+    assert artist is not None

astroquery/alma/utils.py

@@ -60,8 +60,7 @@ def footprint_to_reg(footprint):
     reglist = []
 
     meta = {'source': 1, 'include': 1, 'fixed': 0, 'text': ''}
-    visual = {'color': 'green', 'dash': '0', 'dashlist': '8 3',
-              'font': '"helvetica 10 normal roman"', 'width': '1'}
+    visual = {'color': 'green', 'linestyle': 'solid', 'linewidth': 1.0}
 
     entries = footprint.split()
     if entries[0] == 'Circle':

astroquery/esa/euclid/__init__.py

@@ -15,12 +15,6 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.esa.euclid`.
     """
 
-    URL_BASE = _config.ConfigItem('https://eas.esac.esa.int/', 'Euclid base URL')
-
-    EUCLID_TAP_SERVER = _config.ConfigItem('https://easidr.esac.esa.int/tap-server/tap', 'Euclid TAP Server')
-    EUCLID_DATALINK_SERVER = _config.ConfigItem("https://easidr.esac.esa.int/sas-dd/data?", "Euclid DataLink Server")
-    EUCLID_CUTOUT_SERVER = _config.ConfigItem("https://easidr.esac.esa.int/sas-cutout/cutout?", "Euclid Cutout Server")
-
     ROW_LIMIT = _config.ConfigItem(50,
                                    "Number of rows to return from database query (set to -1 for unlimited).")
 

astroquery/gaia/core.py

@@ -168,7 +168,7 @@ def logout(self, *, verbose=False):
         except HTTPError:
             log.error("Error logging out data server")
 
-    @deprecated_renamed_argument("output_file", None, since="0.4.8")
+    @deprecated_renamed_argument(("output_file", "band"), (None, None), since=("0.4.8", "0.4.11"))
     def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retrieval_type="ALL",
                   linking_parameter='SOURCE_ID', valid_data=False, band=None, avoid_datatype_check=False,
                   format="votable", dump_to_file=False, overwrite_output_file=False, verbose=False,
@@ -212,10 +212,6 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
             In order to retrieve only valid data (data rows where flux is not null and/or the
             rejected_by_photometry flag is set to False) this request parameter should be included
             with valid_data=True.
-        band : str, optional, default None, valid values: G, BP, RP
-            By default, the epoch photometry service returns all the
-            available photometry bands for the requested source.
-            This parameter allows to filter the output lightcurve by its band.
         avoid_datatype_check: boolean, optional, default False.
             By default, this value will be set to False. If it is set to 'true'
             the Datalink items tags will not be checked.
@@ -281,11 +277,6 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
         elif valid_data:
             params_dict['VALID_DATA'] = "true"
 
-        if band is not None:
-            if band != 'G' and band != 'BP' and band != 'RP':
-                raise ValueError(f"Invalid band value '{band}' (Valid values: 'G', 'BP' and 'RP)")
-            else:
-                params_dict['BAND'] = band
         if isinstance(ids, str):
             ids_arg = ids
         else: