astropy 5.2.1__tar.gz → 5.2.2__tar.gz

{astropy-5.2.1 → astropy-5.2.2}/.github/workflows/ci_cron_weekly.yml

@@ -121,6 +121,9 @@ jobs:
           distro: ubuntu_latest
 
           shell: /bin/bash
+          env: |
+            ARCH_ON_CI: ${{ env.ARCH_ON_CI }}
+            IS_CRON: ${{ env.IS_CRON }}
 
           install: |
             apt-get update -q -y

{astropy-5.2.1 → astropy-5.2.2}/.pre-commit-config.yaml

@@ -65,7 +65,7 @@ repos:
       - id: yesqa
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
         name: isort (python)

{astropy-5.2.1 → astropy-5.2.2}/.readthedocs.yaml

@@ -1,11 +1,12 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
-  apt_packages:
-    - graphviz
+  os: "ubuntu-20.04"
   tools:
-    python: "3.9"
+    python: "mambaforge-4.10"
+
+conda:
+  environment: docs/rtd_environment.yaml
 
 sphinx:
   builder: html

{astropy-5.2.1 → astropy-5.2.2}/CHANGES.rst

@@ -1,3 +1,41 @@
+Version 5.2.2 (2023-03-28)
+==========================
+
+Bug Fixes
+---------
+
+astropy.io.ascii
+^^^^^^^^^^^^^^^^
+
+- CDS and MRT tables with units that contain with multiple divisions, such as
+  ``km/s/Mpc`` now parse correctly as being equal to ``km/(s.Mpc)``. [#14369]
+
+astropy.io.fits
+^^^^^^^^^^^^^^^
+
+- Fix ``FITSDiff`` when table contains a VLA column with the Q type. [#14539]
+
+astropy.table
+^^^^^^^^^^^^^
+
+- Fix a bug when creating a ``QTable`` when a ``Quantity`` input column is present and the
+  ``units`` argument modifies the unit of that column. This now works as expected where
+  previously this caused an exception. [#14357]
+
+astropy.units
+^^^^^^^^^^^^^
+
+- CDS units with multiple divisions, such as ``km/s/Mpc`` now parse
+  correctly as being equal to ``km/(s.Mpc)``. [#14369]
+
+astropy.wcs
+^^^^^^^^^^^
+
+- Fixed a bug that caused subclasses of BaseHighLevelWCS and HighLevelWCSMixin to
+  not work correctly under certain conditions if they did not have ``world_n_dim``
+  and ``pixel_n_dim`` defined on them. [#14495]
+
+
 Version 5.2.1 (2023-01-06)
 ==========================
 

{astropy-5.2.1/astropy.egg-info → astropy-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: astropy
-Version: 5.2.1
+Version: 5.2.2
 Summary: Astronomy and astrophysics core library
 Home-page: http://astropy.org
 Author: The Astropy Developers

{astropy-5.2.1 → astropy-5.2.2}/astropy/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '5.2.1'
-__version_tuple__ = version_tuple = (5, 2, 1)
+__version__ = version = '5.2.2'
+__version_tuple__ = version_tuple = (5, 2, 2)

{astropy-5.2.1 → astropy-5.2.2}/astropy/convolution/convolve.py

@@ -194,7 +194,7 @@ def convolve(
         (i.e., not 0/`False`) will be set to NaN for the convolution.  If
         `None`, no masking will be performed unless ``array`` is a masked array.
         If ``mask`` is not `None` *and* ``array`` is a masked array, a pixel is
-        masked of it is masked in either ``mask`` *or* ``array.mask``.
+        masked if it is masked in either ``mask`` *or* ``array.mask``.
     normalization_zero_tol : float, optional
         The absolute tolerance on whether the kernel is different than zero.
         If the kernel sums to zero to within this precision, it cannot be
@@ -564,7 +564,7 @@ def convolve_fft(
         (i.e., not 0/`False`) will be set to NaN for the convolution.  If
         `None`, no masking will be performed unless ``array`` is a masked array.
         If ``mask`` is not `None` *and* ``array`` is a masked array, a pixel is
-        masked of it is masked in either ``mask`` *or* ``array.mask``.
+        masked if it is masked in either ``mask`` *or* ``array.mask``.
     crop : bool, optional
         Default on.  Return an image of the size of the larger of the input
         image and the kernel.
@@ -734,7 +734,7 @@ def convolve_fft(
     kernshape = kernel.shape
 
     array_size_B = (
-        np.product(arrayshape, dtype=np.int64) * np.dtype(complex_dtype).itemsize
+        np.prod(arrayshape, dtype=np.int64) * np.dtype(complex_dtype).itemsize
     ) * u.byte
     if array_size_B > 1 * u.GB and not allow_huge:
         raise ValueError(
@@ -840,7 +840,7 @@ def convolve_fft(
 
     # perform a second check after padding
     array_size_C = (
-        np.product(newshape, dtype=np.int64) * np.dtype(complex_dtype).itemsize
+        np.prod(newshape, dtype=np.int64) * np.dtype(complex_dtype).itemsize
     ) * u.byte
     if array_size_C > 1 * u.GB and not allow_huge:
         raise ValueError(
@@ -854,12 +854,12 @@ def convolve_fft(
     #         (kernel*array)fft +
     #         optional(weight image + weight_fft + weight_ifft) +
     #         optional(returned_fft))
-    # total_memory_used_GB = (np.product(newshape)*np.dtype(complex_dtype).itemsize
+    # total_memory_used_GB = (np.prod(newshape)*np.dtype(complex_dtype).itemsize
     #                        * (5 + 3*((interpolate_nan or ) and kernel_is_normalized))
     #                        + (1 + (not return_fft)) *
-    #                          np.product(arrayshape)*np.dtype(complex_dtype).itemsize
-    #                        + np.product(arrayshape)*np.dtype(bool).itemsize
-    #                        + np.product(kernshape)*np.dtype(bool).itemsize)
+    #                          np.prod(arrayshape)*np.dtype(complex_dtype).itemsize
+    #                        + np.prod(arrayshape)*np.dtype(bool).itemsize
+    #                        + np.prod(kernshape)*np.dtype(bool).itemsize)
     #                        ) / 1024.**3
 
     # separate each dimension by the padding size...  this is to determine the

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/ascii/tests/test_html.py

@@ -667,7 +667,7 @@ def test_raw_html_write_clean():
         format="ascii.html",
         htmldict={
             "raw_html_cols": t.colnames,
-            "raw_html_clean_kwargs": {"tags": bleach.ALLOWED_TAGS + ["p"]},
+            "raw_html_clean_kwargs": {"tags": list(bleach.ALLOWED_TAGS) + ["p"]},
         },
     )
     expected = """\

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/fits/diff.py

@@ -1489,7 +1489,7 @@ class TableDataDiff(_BaseDiff):
                 arrb.dtype, np.floating
             ):
                 diffs = where_not_allclose(arra, arrb, rtol=self.rtol, atol=self.atol)
-            elif "P" in col.format:
+            elif "P" in col.format or "Q" in col.format:
                 diffs = (
                     [
                         idx

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/fits/tests/test_diff.py

@@ -406,16 +406,17 @@ class TestDiff(FitsTestCase):
         c8 = Column("H", format="C", array=[0.0 + 1.0j, 2.0 + 3.0j])
         c9 = Column("I", format="M", array=[4.0 + 5.0j, 6.0 + 7.0j])
         c10 = Column("J", format="PI(2)", array=[[0, 1], [2, 3]])
+        c11 = Column("K", format="QJ(2)", array=[[0, 1], [2, 3]])
 
-        columns = [c1, c2, c3, c4, c5, c6, c7, c8, c9, c10]
+        columns = [c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11]
 
         ta = BinTableHDU.from_columns(columns)
         tb = BinTableHDU.from_columns([c.copy() for c in columns])
 
         diff = TableDataDiff(ta.data, tb.data)
         assert diff.identical
-        assert len(diff.common_columns) == 10
-        assert diff.common_column_names == set("abcdefghij")
+        assert len(diff.common_columns) == 11
+        assert diff.common_column_names == set("abcdefghijk")
         assert diff.diff_ratio == 0
         assert diff.diff_total == 0
 
@@ -549,6 +550,7 @@ class TestDiff(FitsTestCase):
         ca8 = Column("H", format="C", array=[0.0 + 1.0j, 2.0 + 3.0j])
         ca9 = Column("I", format="M", array=[4.0 + 5.0j, 6.0 + 7.0j])
         ca10 = Column("J", format="PI(2)", array=[[0, 1], [2, 3]])
+        ca11 = Column("K", format="QJ(2)", array=[[0, 1], [2, 3]])
 
         cb1 = Column("A", format="L", array=[False, False])
         cb2 = Column("B", format="X", array=[[0], [0]])
@@ -560,12 +562,13 @@ class TestDiff(FitsTestCase):
         cb8 = Column("H", format="C", array=[1.0 + 1.0j, 2.0 + 3.0j])
         cb9 = Column("I", format="M", array=[5.0 + 5.0j, 6.0 + 7.0j])
         cb10 = Column("J", format="PI(2)", array=[[1, 2], [3, 4]])
+        cb11 = Column("K", format="QJ(2)", array=[[1, 2], [3, 4]])
 
         ta = BinTableHDU.from_columns(
-            [ca1, ca2, ca3, ca4, ca5, ca6, ca7, ca8, ca9, ca10]
+            [ca1, ca2, ca3, ca4, ca5, ca6, ca7, ca8, ca9, ca10, ca11]
         )
         tb = BinTableHDU.from_columns(
-            [cb1, cb2, cb3, cb4, cb5, cb6, cb7, cb8, cb9, cb10]
+            [cb1, cb2, cb3, cb4, cb5, cb6, cb7, cb8, cb9, cb10, cb11]
         )
 
         diff = TableDataDiff(ta.data, tb.data, numdiffs=20)
@@ -591,14 +594,20 @@ class TestDiff(FitsTestCase):
         assert diff.diff_values[12][0] == ("J", 1)
         assert (diff.diff_values[12][1][0] == [2, 3]).all()
         assert (diff.diff_values[12][1][1] == [3, 4]).all()
+        assert diff.diff_values[13][0] == ("K", 0)
+        assert (diff.diff_values[13][1][0] == [0, 1]).all()
+        assert (diff.diff_values[13][1][1] == [1, 2]).all()
+        assert diff.diff_values[14][0] == ("K", 1)
+        assert (diff.diff_values[14][1][0] == [2, 3]).all()
+        assert (diff.diff_values[14][1][1] == [3, 4]).all()
 
-        assert diff.diff_total == 13
-        assert diff.diff_ratio == 0.65
+        assert diff.diff_total == 15
+        assert np.isclose(diff.diff_ratio, 0.682, atol=1e-3, rtol=0)
 
         report = diff.report()
         assert "Column A data differs in row 0:\n    a> True\n    b> False" in report
         assert "...and at 1 more indices.\n Column D data differs in row 0:" in report
-        assert "13 different table data element(s) found (65.00% different)" in report
+        assert "15 different table data element(s) found (68.18% different)" in report
         assert report.count("more indices") == 1
 
     def test_identical_files_basic(self):

astropy-5.2.2/astropy/io/misc/asdf/conftest.py

@@ -0,0 +1,24 @@
+from pathlib import Path
+
+from astropy.utils.introspection import minversion
+
+
+def get_asdf_tests():
+    # return a list of filenames for all ".py" files in this
+    # directory and recursively in every sub directory. These
+    # are the files that pytest will import while attempting
+    # to find tests. This list is used below to ignore all of
+    # these files if an incompatible version of ASDF is installed
+    asdf_dir = Path(__file__).parent.resolve()
+    paths = Path(asdf_dir).rglob("*.py")
+    return [str(p.relative_to(asdf_dir)) for p in paths]
+
+
+collect_ignore = get_asdf_tests()
+try:
+    import asdf
+except ImportError:
+    pass
+else:
+    if not minversion(asdf, "3.0.0.dev"):
+        collect_ignore = []

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/misc/asdf/extension.py

@@ -1,8 +1,23 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
 import os
+import warnings
+
+from asdf.exceptions import AsdfDeprecationWarning
+
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        category=AsdfDeprecationWarning,
+        message=r"AsdfExtension is deprecated.*",
+    )
+    warnings.filterwarnings(
+        "ignore",
+        category=AsdfDeprecationWarning,
+        message=r"BuiltinExtension is deprecated.*",
+    )
+    from asdf.extension import AsdfExtension, BuiltinExtension
 
-from asdf.extension import AsdfExtension, BuiltinExtension
 from asdf.util import filepath_to_url
 
 # Make sure that all tag implementations are imported by the time we create

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/misc/asdf/tags/coordinates/tests/test_angle.py

@@ -1,13 +1,23 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
+import warnings
+
 import pytest
 
 asdf = pytest.importorskip("asdf")
 
-from asdf.tests.helpers import assert_roundtrip_tree  # noqa: E402
+from asdf.exceptions import AsdfDeprecationWarning
+
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        category=AsdfDeprecationWarning,
+        message=r"asdf.tests.helpers is deprecated.*",
+    )
+    from asdf.tests.helpers import assert_roundtrip_tree
 
-import astropy.units as u  # noqa: E402
-from astropy.coordinates import Angle, Latitude, Longitude  # noqa: E402
+import astropy.units as u
+from astropy.coordinates import Angle, Latitude, Longitude
 
 
 def test_angle(tmpdir):

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/misc/asdf/tags/coordinates/tests/test_earthlocation.py

@@ -1,13 +1,24 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
+import warnings
+
 import pytest
 
 asdf = pytest.importorskip("asdf")
-from asdf.tests.helpers import assert_roundtrip_tree  # noqa: E402
 
-from astropy import units as u  # noqa: E402
-from astropy.coordinates.angles import Latitude, Longitude  # noqa: E402
-from astropy.coordinates.earth import ELLIPSOIDS, EarthLocation  # noqa: E402
+from asdf.exceptions import AsdfDeprecationWarning
+
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        category=AsdfDeprecationWarning,
+        message=r"asdf.tests.helpers is deprecated.*",
+    )
+    from asdf.tests.helpers import assert_roundtrip_tree
+
+from astropy import units as u
+from astropy.coordinates.angles import Latitude, Longitude
+from astropy.coordinates.earth import ELLIPSOIDS, EarthLocation
 
 
 @pytest.fixture

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/misc/asdf/tags/coordinates/tests/test_frames.py

@@ -1,12 +1,23 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
+import warnings
+
 import pytest
 
 asdf = pytest.importorskip("asdf")
-from asdf.tests.helpers import assert_roundtrip_tree  # noqa: E402
 
-from astropy import units  # noqa: E402
-from astropy.coordinates import FK5, ICRS, Angle, Latitude, Longitude  # noqa: E402
+from asdf.exceptions import AsdfDeprecationWarning
+
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        category=AsdfDeprecationWarning,
+        message=r"asdf.tests.helpers is deprecated.*",
+    )
+    from asdf.tests.helpers import assert_roundtrip_tree
+
+from astropy import units
+from astropy.coordinates import FK5, ICRS, Angle, Latitude, Longitude
 
 
 def test_hcrs_basic(tmpdir):

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/misc/asdf/tags/coordinates/tests/test_representation.py

@@ -1,10 +1,21 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+import warnings
+
 import pytest
 
 asdf = pytest.importorskip("asdf")
 
-from asdf.tests.helpers import assert_roundtrip_tree  # noqa: E402
-from numpy.random import randint, random  # noqa: E402
+from asdf.exceptions import AsdfDeprecationWarning
+
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        category=AsdfDeprecationWarning,
+        message=r"asdf.tests.helpers is deprecated.*",
+    )
+    from asdf.tests.helpers import assert_roundtrip_tree
+
+from numpy.random import randint, random
 
 import astropy.coordinates.representation as r  # noqa: E402
 import astropy.units as u  # noqa: E402

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/misc/asdf/tags/coordinates/tests/test_skycoord.py

@@ -1,5 +1,7 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
+import warnings
+
 import numpy as np
 import pytest
 
@@ -7,7 +9,16 @@ from astropy import units as u
 from astropy.coordinates import FK4, ICRS, Galactic, Longitude, SkyCoord
 
 asdf = pytest.importorskip("asdf")
-from asdf.tests.helpers import assert_roundtrip_tree  # noqa: E402
+
+from asdf.exceptions import AsdfDeprecationWarning
+
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        category=AsdfDeprecationWarning,
+        message=r"asdf.tests.helpers is deprecated.*",
+    )
+    from asdf.tests.helpers import assert_roundtrip_tree
 
 # These tests are cribbed directly from the Examples section of
 # https://docs.astropy.org/en/stable/api/astropy.coordinates.SkyCoord.html

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/misc/asdf/tags/coordinates/tests/test_spectralcoord.py

@@ -1,5 +1,7 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
+import warnings
+
 import pytest
 
 from astropy import units as u
@@ -7,7 +9,16 @@ from astropy.coordinates import ICRS, Galactic, SpectralCoord
 from astropy.tests.helper import assert_quantity_allclose
 
 asdf = pytest.importorskip("asdf")
-from asdf.tests.helpers import assert_roundtrip_tree  # noqa: E402
+
+from asdf.exceptions import AsdfDeprecationWarning
+
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        category=AsdfDeprecationWarning,
+        message=r"asdf.tests.helpers is deprecated.*",
+    )
+    from asdf.tests.helpers import assert_roundtrip_tree
 
 
 def test_scalar_spectralcoord(tmpdir):

{astropy-5.2.1 → astropy-5.2.2}/astropy/io/misc/asdf/tags/fits/tests/test_fits.py

@@ -1,29 +1,43 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
+import warnings
+
 import pytest
 
 asdf = pytest.importorskip("asdf")
 
 import os  # noqa: E402
 
-import numpy as np  # noqa: E402
-from asdf.tests import helpers  # noqa: E402
+import numpy as np
+from asdf.exceptions import AsdfDeprecationWarning
 
-from astropy.io import fits  # noqa: E402
-from astropy.io.misc.asdf.tags.tests.helpers import (  # noqa: E402
-    run_schema_example_test,
-)
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        category=AsdfDeprecationWarning,
+        message=r"asdf.tests.helpers is deprecated.*",
+    )
+    from asdf.tests.helpers import assert_roundtrip_tree
+
+from astropy.io import fits
+from astropy.io.misc.asdf.tags.tests.helpers import run_schema_example_test
 
 
+@pytest.mark.filterwarnings(
+    "ignore:The property AsdfFile.blocks has been deprecated:asdf.exceptions.AsdfDeprecationWarning"
+)
 def test_complex_structure(tmpdir):
     with fits.open(
         os.path.join(os.path.dirname(__file__), "data", "complex.fits"), memmap=False
     ) as hdulist:
         tree = {"fits": hdulist}
 
-        helpers.assert_roundtrip_tree(tree, tmpdir)
+        assert_roundtrip_tree(tree, tmpdir)
 
 
+@pytest.mark.filterwarnings(
+    "ignore:The property AsdfFile.blocks has been deprecated:asdf.exceptions.AsdfDeprecationWarning"
+)
 def test_fits_table(tmpdir):
     a = np.array([(0, 1), (2, 3)], dtype=[("A", int), ("B", int)])
 
@@ -34,9 +48,12 @@ def test_fits_table(tmpdir):
     def check_yaml(content):
         assert b"!<tag:astropy.org:astropy/table/table-1.0.0>" in content
 
-    helpers.assert_roundtrip_tree(tree, tmpdir, raw_yaml_check_func=check_yaml)
+    assert_roundtrip_tree(tree, tmpdir, raw_yaml_check_func=check_yaml)
 
 
+@pytest.mark.filterwarnings(
+    "ignore:The property AsdfFile.blocks has been deprecated:asdf.exceptions.AsdfDeprecationWarning"
+)
 def test_backwards_compat():
     """
     Make sure that we can continue to read FITS HDUs that use the schema from