astroquery 0.4.8.dev9306__tar.gz → 0.4.8.dev9321__tar.gz

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/CHANGES.rst

@@ -13,6 +13,11 @@ mpc
 
 - Parse star catalog information when querying observations database [#2957]
 
+linelists.cdms
+^^^^^^^^^^^^^^
+
+- Fix result parsing incompatibility with astropy 6.1 on Windows systems. [#3008]
+
 splatalogue
 ^^^^^^^^^^^
 
@@ -25,6 +30,13 @@ vizier
   from ``IndexError`` to ``EmptyResponseError`` [#2980]
 
 
+skyview
+^^^^^^^
+
+- Overlay arguments ``lut``, ``grid``, and ``gridlabel`` are removed, as they
+  only apply to output types not returned by Astroquery [#2979]
+
+
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------
 
@@ -32,6 +44,7 @@ Infrastructure, Utility and Other Changes and Additions
 
 - Versions of Python <3.9 are no longer supported. [#2966]
 
+- Versions of PyVO <1.5 are no longer supported. [#3002]
 
 utils.tap
 ^^^^^^^^^
@@ -207,7 +220,7 @@ esa.hubble
 
 - New method ``get_datalabs_path`` to return the complete path of a file in
   datalabs by combining the datalabs volume path with the path of the file
-  in the table ehst.artifact [#2998]
+  in the table ehst.artifact [#2998, #3010]
 
 esa.jwst
 ^^^^^^^^

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: astroquery
-Version: 0.4.8.dev9306
+Version: 0.4.8.dev9321
 Summary: Functions and classes to access online astronomical data resources
 Author: The Astroquery Developers
 License: BSD
@@ -24,7 +24,7 @@ Requires-Dist: requests>=2.19
 Requires-Dist: beautifulsoup4>=4.8
 Requires-Dist: html5lib>=0.999
 Requires-Dist: keyring>=15.0
-Requires-Dist: pyvo>=1.1
+Requires-Dist: pyvo>=1.5
 Provides-Extra: test
 Requires-Dist: pytest-astropy; extra == "test"
 Requires-Dist: matplotlib; extra == "test"

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/alma/core.py

@@ -20,12 +20,7 @@ from astropy.utils.console import ProgressBar
 from astropy import units as u
 from astropy.time import Time
 
-try:
-    from pyvo.dal.sia2 import SIA2_PARAMETERS_DESC, SIA2Service
-except ImportError:
-    # Can be removed once min version of pyvo is 1.5
-    from pyvo.dal.sia2 import SIA_PARAMETERS_DESC as SIA2_PARAMETERS_DESC
-    from pyvo.dal.sia2 import SIAService as SIA2Service
+from pyvo.dal.sia2 import SIA2_PARAMETERS_DESC, SIA2Service
 
 from ..exceptions import LoginError
 from ..utils import commons

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/alma/tests/test_alma_remote.py

@@ -10,11 +10,8 @@ from astropy import coordinates
 from astropy import units as u
 import numpy as np
 import pytest
-try:
-    # This requires pyvo 1.4
-    from pyvo.dal.exceptions import DALOverflowWarning
-except ImportError:
-    pass
+
+from pyvo.dal.exceptions import DALOverflowWarning
 
 from astroquery.exceptions import CorruptDataWarning
 from .. import Alma
@@ -52,7 +49,6 @@ def alma(request):
 @pytest.mark.remote_data
 class TestAlma:
     def test_public(self, alma):
-        # This warning was added in pyvo 1.4, but we don't test older versions with remote-data
         with pytest.warns(expected_warning=DALOverflowWarning,
                           match="Partial result set. Potential causes MAXREC, async storage space, etc."):
             results = alma.query(payload=None, public=True, maxrec=100)
@@ -88,7 +84,6 @@ class TestAlma:
     def test_bands(self, alma):
         payload = {'band_list': ['5', '7']}
         # Added maxrec here as downloading and reading the results take too long.
-        # This warning was added in pyvo 1.4, but we don't test older versions with remote-data
         with pytest.warns(expected_warning=DALOverflowWarning,
                           match="Partial result set. Potential causes MAXREC, async storage space, etc."):
             result = alma.query(payload, maxrec=1000)

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/esa/hubble/core.py

@@ -1018,6 +1018,10 @@ class ESAHubbleClass(BaseQuery):
         The complete path of the file name in Datalabs
         """
 
+        # FITS files are always compressed
+        if filename.endswith('.fits'):
+            filename = f"{filename}.gz"
+
         query = f"select file_path from ehst.artifact where file_name = '{filename}'"
         job = self.query_tap(query=query)
         if job is None:

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/esa/hubble/tests/test_esa_hubble_remote.py

@@ -130,6 +130,10 @@ class TestEsaHubbleRemoteData:
                                                folder=str(self.temp_folder_for_fits.name))
         assert len(os.listdir(self.temp_folder_for_fits.name)) > 0
 
-    def test_get_datalabs_path(self):
+    def test_get_datalabs_path_image(self):
         result = esa_hubble.get_datalabs_path(filename='ib4x04ivq_flt.jpg', default_volume=None)
         assert result == '/data/user/hub_hstdata_i/i/b4x/04/ib4x04ivq_flt.jpg'
+
+    def test_get_datalabs_path_fits(self):
+        result = esa_hubble.get_datalabs_path(filename='ib4x04ivq_flt.fits', default_volume=None)
+        assert result == '/data/user/hub_hstdata_i/i/b4x/04/ib4x04ivq_flt.fits.gz'

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/ipac/irsa/core.py

@@ -14,12 +14,7 @@ from astropy.utils.decorators import deprecated_renamed_argument
 
 from pyvo.dal import TAPService
 
-try:
-    from pyvo.dal.sia2 import SIA2Service, SIA2_PARAMETERS_DESC
-except ImportError:
-    # Can be removed once min version of pyvo is 1.5
-    from pyvo.dal.sia2 import SIA_PARAMETERS_DESC as SIA2_PARAMETERS_DESC
-    from pyvo.dal.sia2 import SIAService as SIA2Service
+from pyvo.dal.sia2 import SIA2Service, SIA2_PARAMETERS_DESC
 
 from astroquery import log
 from astroquery.query import BaseVOQuery

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/ipac/irsa/tests/test_irsa_remote.py

@@ -6,11 +6,7 @@ from astropy.table import Table
 from astropy.coordinates import SkyCoord
 from astropy.utils.exceptions import AstropyDeprecationWarning
 
-try:
-    # This requires pyvo 1.4
-    from pyvo.dal.exceptions import DALOverflowWarning
-except ImportError:
-    pass
+from pyvo.dal.exceptions import DALOverflowWarning
 
 from astroquery.ipac.irsa import Irsa
 

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/linelists/cdms/core.py

@@ -261,7 +261,7 @@ class CDMSClass(BaseQuery):
                 qnind = qn+suf
                 fix_keys.append(qnind)
         for key in fix_keys:
-            if result[key].dtype != int:
+            if not np.issubdtype(result[key].dtype, np.integer):
                 intcol = np.array(list(map(parse_letternumber, result[key])),
                                   dtype=int)
                 result[key] = intcol

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/simbad/tests/test_simbad_remote.py

@@ -11,13 +11,8 @@ from astroquery.simbad import Simbad
 # Maybe we need to expose SimbadVOTableResult to be in the public API?
 from astroquery.simbad.core import SimbadVOTableResult
 from astroquery.exceptions import BlankResponseWarning
-from packaging import version
-from pyvo import __version__ as pyvo_version
-try:
-    # This requires pyvo 1.4
-    from pyvo.dal.exceptions import DALOverflowWarning
-except ImportError:
-    pass
+
+from pyvo.dal.exceptions import DALOverflowWarning
 
 
 # M42 coordinates
@@ -273,11 +268,9 @@ class TestSimbad:
         expect = "letters numbers\n------- -------\n      a       1\n      b       2\n      c       3"
         assert expect == str(result)
         # Test query_tap raised errors
-        # DALOverflowWarning exists since pyvo 1.4
-        if version.parse(pyvo_version) > version.parse('1.4'):
-            with pytest.raises(DALOverflowWarning, match="Partial result set *"):
-                truncated_result = Simbad.query_tap("SELECT * from basic", maxrec=2)
-                assert len(truncated_result) == 2
+        with pytest.raises(DALOverflowWarning, match="Partial result set *"):
+            truncated_result = Simbad.query_tap("SELECT * from basic", maxrec=2)
+            assert len(truncated_result) == 2
         with pytest.raises(ValueError, match="The maximum number of records cannot exceed 2000000."):
             Simbad.query_tap("select top 5 * from basic", maxrec=10e10)
         with pytest.raises(ValueError, match="Query string contains an odd number of single quotes.*"):

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/skyview/core.py

@@ -87,8 +87,7 @@ class SkyViewClass(BaseQuery):
 
     def get_images(self, position, survey, *, coordinates=None, projection=None,
                    pixels=None, scaling=None, sampler=None, resolver=None,
-                   deedger=None, lut=None, grid=None, gridlabels=None,
-                   radius=None, height=None, width=None, cache=True,
+                   deedger=None, radius=None, height=None, width=None, cache=True,
                    show_progress=True):
         """
         Query the SkyView service, download the FITS file that will be
@@ -164,13 +163,6 @@ class SkyViewClass(BaseQuery):
             de-edging algorithm. The supported values are: ``"_skip_"`` to
             use the survey default, ``"skyview.process.Deedger"`` (for
             enabling de-edging), and ``"null"`` to disable.
-        lut : str
-            Choose from the color table selections to display the data in
-            false color.
-        grid : bool
-            overlay a coordinate grid on the image if True
-        gridlabels : bool
-            annotate the grid with coordinates positions if True
         radius : `~astropy.units.Quantity` or None
             The angular radius of the specified field.
             Overrides the ``width`` and ``height`` parameters.
@@ -204,7 +196,6 @@ class SkyViewClass(BaseQuery):
         readable_objects = self.get_images_async(position, survey, coordinates=coordinates,
                                                  projection=projection, pixels=pixels, scaling=scaling,
                                                  sampler=sampler, resolver=resolver, deedger=deedger,
-                                                 lut=lut, grid=grid, gridlabels=gridlabels,
                                                  radius=radius, height=height, width=width,
                                                  cache=cache, show_progress=show_progress)
         return [obj.get_fits() for obj in readable_objects]
@@ -212,9 +203,9 @@ class SkyViewClass(BaseQuery):
     @prepend_docstr_nosections(get_images.__doc__)
     def get_images_async(self, position, survey, *, coordinates=None,
                          projection=None, pixels=None, scaling=None,
-                         sampler=None, resolver=None, deedger=None, lut=None,
-                         grid=None, gridlabels=None, radius=None, height=None,
-                         width=None, cache=True, show_progress=True):
+                         sampler=None, resolver=None, deedger=None,
+                         radius=None, height=None, width=None,
+                         cache=True, show_progress=True):
         """
         Returns
         -------
@@ -222,10 +213,8 @@ class SkyViewClass(BaseQuery):
         """
         image_urls = self.get_image_list(position, survey, coordinates=coordinates,
                                          projection=projection, pixels=pixels, scaling=scaling, sampler=sampler,
-                                         resolver=resolver, deedger=deedger, lut=lut, grid=grid,
-                                         gridlabels=gridlabels, radius=radius,
-                                         height=height, width=width,
-                                         cache=cache)
+                                         resolver=resolver, deedger=deedger, radius=radius,
+                                         height=height, width=width, cache=cache)
         return [commons.FileContainer(url, encoding='binary',
                                       show_progress=show_progress)
                 for url in image_urls]
@@ -233,9 +222,8 @@ class SkyViewClass(BaseQuery):
     @prepend_docstr_nosections(get_images.__doc__, sections=['Returns', 'Examples'])
     def get_image_list(self, position, survey, *, coordinates=None,
                        projection=None, pixels=None, scaling=None,
-                       sampler=None, resolver=None, deedger=None, lut=None,
-                       grid=None, gridlabels=None, radius=None, width=None,
-                       height=None, cache=True):
+                       sampler=None, resolver=None, deedger=None,
+                       radius=None, width=None, height=None, cache=True):
         """
         Returns
         -------
@@ -267,12 +255,9 @@ class SkyViewClass(BaseQuery):
             'Position': parse_coordinates(position),
             'survey': survey,
             'Deedger': deedger,
-            'lut': lut,
             'projection': projection,
-            'gridlabels': '1' if gridlabels else '0',
             'coordinates': coordinates,
             'scaling': scaling,
-            'grid': grid,
             'resolver': resolver,
             'Sampler': sampler,
             'imscale': size_deg,

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/astroquery/version.py

@@ -1,4 +1,4 @@
-# Autogenerated by Astropy-affiliated package astroquery's setup.py on 2024-05-03 06:57:09 UTC
+# Autogenerated by Astropy-affiliated package astroquery's setup.py on 2024-05-23 07:15:30 UTC
 import datetime
 
 
@@ -188,8 +188,8 @@ def _get_repo_path(pathname, levels=None):  # pragma: no cover
 
 
 _packagename = "astroquery"
-_last_generated_version = "0.4.8.dev9306"
-_last_githash = "2f8733307c60bdfe8da691771b0189a04dda538f"
+_last_generated_version = "0.4.8.dev9321"
+_last_githash = "26ce1d75bf99ed2dccc3efc63c56211b1709bbfc"
 
 # Determine where the source code for this module
 # lives.  If __file__ is not a filesystem path then
@@ -212,7 +212,7 @@ bugfix = 8
 version_info = (major, minor, bugfix)
 
 release = False
-timestamp = datetime.datetime(2024, 5, 3, 6, 57, 9)
+timestamp = datetime.datetime(2024, 5, 23, 7, 15, 30)
 debug = False
 
 astropy_helpers_version = "4.0.1"

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/docs/index.rst

@@ -95,13 +95,13 @@ building the documentation, in editable mode:
 Requirements
 ------------
 
-Astroquery works with Python 3.7 or later.
+Astroquery works with Python 3.9 or later.
 
 The following packages are required for astroquery installation & use:
 
-* `numpy <http://www.numpy.org>`_ >= 1.18
-* `astropy <http://www.astropy.org>`__ (>=4.2.1)
-* `pyVO`_ (>=1.1)
+* `numpy <http://www.numpy.org>`_ >= 1.20
+* `astropy <http://www.astropy.org>`__ (>=5.0)
+* `pyVO`_ (>=1.5)
 * `requests <https://requests.readthedocs.io/en/latest/>`_
 * `keyring <https://pypi.python.org/pypi/keyring>`_
 * `Beautiful Soup <https://www.crummy.com/software/BeautifulSoup/>`_

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/setup.cfg

@@ -137,7 +137,7 @@ install_requires=
    beautifulsoup4>=4.8
    html5lib>=0.999
    keyring>=15.0
-   pyvo>=1.1
+   pyvo>=1.5
 tests_require =
    pytest-doctestplus>=0.13
    pytest-astropy

{astroquery-0.4.8.dev9306 → astroquery-0.4.8.dev9321}/tox.ini

@@ -37,7 +37,7 @@ deps =
     oldestdeps: astropy==5.0.0
     oldestdeps: numpy==1.20
     oldestdeps: matplotlib==3.4.*
-    oldestdeps: pyvo==1.1
+    oldestdeps: pyvo==1.5
     oldestdeps: pytest-doctestplus==0.13
     oldestdeps: requests==2.25
     oldestdeps: keyring==15.0