pytest-arraydiff 0.6.1__tar.gz → 0.7.0__tar.gz

pytest_arraydiff-0.7.0/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: ".github/workflows"
+    schedule:
+      interval: "monthly"
+    groups:
+      actions:
+        patterns:
+          - "*"

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/.github/workflows/ci_workflows.yml

@@ -6,6 +6,7 @@ on:
   schedule:
     # Run every Sunday at 06:53 UTC
     - cron: 53 6 * * 0
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -13,28 +14,29 @@ concurrency:
 
 jobs:
   tests:
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@2835f0cacddf3f8de198db9afdb5354a5cebe0ef # v2.6.3
     with:
       envs: |
         - linux: codestyle
-        - linux: py37-test-pytestoldest
-        - macos: py37-test-pytest50
-        - windows: py38-test-pytest52
-        - linux: py38-test-pytest53
-        - macos: py39-test-pytest60
-        - windows: py39-test-pytest61
+        - windows: py39-test-pytest62
         - linux: py310-test-pytest62
         - macos: py310-test-pytest70
         - windows: py310-test-pytest71
         - linux: py311-test-pytest72
         - macos: py311-test-pytest73
         - windows: py312-test-pytest74
-        - linux: py312-test-devdeps
+        - linux: py313-test-pytest83
+        - linux: py313-test-pytest90
+        - linux: py313-test-parallel
+        - linux: py314t-test
+        - linux: py314t-test-parallel
+        - linux: py313-test-devdeps
   publish:
     needs: tests
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@2835f0cacddf3f8de198db9afdb5354a5cebe0ef # v2.6.3
     with:
       test_extras: test
       test_command: pytest $GITHUB_WORKSPACE/tests; pytest --arraydiff $GITHUB_WORKSPACE/tests
+      python-version: '3.9'
     secrets:
       pypi_token: ${{ secrets.pypi_password }}

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/CHANGES.md

@@ -1,3 +1,10 @@
+0.7 (2026-05-02)
+----------------
+
+- Minimum Python version is now 3.9. [#49, #57]
+
+- Fixed compatibility with free-threaded Python. [#63]
+
 0.6.1 (2023-11-27)
 ------------------
 

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/MANIFEST.in

@@ -1,4 +1,3 @@
-include LICENSE
 include README.rst
 include CHANGES.md
 include tox.ini

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/PKG-INFO

@@ -1,37 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-arraydiff
-Version: 0.6.1
+Version: 0.7.0
 Summary: pytest plugin to help with comparing array output from tests
 Home-page: https://github.com/astropy/pytest-arraydiff
 Author: The Astropy Developers
 Author-email: astropy.team@gmail.com
-License: BSD
+License: BSD-3-Clause
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Utilities
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: pytest>=4.6
+Requires-Dist: pytest>=6.2
 Requires-Dist: numpy
 Provides-Extra: test
 Requires-Dist: astropy; extra == "test"
 Requires-Dist: pandas; extra == "test"
-Requires-Dist: tables; extra == "test"
+Provides-Extra: test-hdf5
+Requires-Dist: tables; platform_machine != "arm64" and extra == "test-hdf5"
+Dynamic: license-file
 
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.5811772.svg
    :target: https://doi.org/10.5281/zenodo.5811772

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=30.3.0",
+requires = ["setuptools>=77.0.1",
             "setuptools_scm",
-            "wheel"]
+]
 build-backend = 'setuptools.build_meta'

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/pytest_arraydiff/plugin.py

@@ -43,7 +43,7 @@ abstractstaticmethod = abc.abstractstaticmethod
 abstractclassmethod = abc.abstractclassmethod
 
 
-class BaseDiff(object, metaclass=abc.ABCMeta):
+class BaseDiff(metaclass=abc.ABCMeta):
 
     @abstractstaticmethod
     def read(filename):
@@ -83,8 +83,8 @@ class SimpleArrayDiff(BaseDiff):
         try:
             np.testing.assert_allclose(array_ref, array_new, atol=atol, rtol=rtol)
         except AssertionError as exc:
-            message = "\n\na: {0}".format(test_file) + '\n'
-            message += "b: {0}".format(reference_file) + '\n'
+            message = f"\n\na: {test_file}" + '\n'
+            message += f"b: {reference_file}" + '\n'
             message += exc.args[0]
             return False, message
         else:
@@ -160,8 +160,8 @@ class PDHDFDiff(BaseDiff):
         try:
             pdt.assert_frame_equal(ref_data, test_data)
         except AssertionError as exc:
-            message = "\n\na: {0}".format(test_file) + '\n'
-            message += "b: {0}".format(reference_file) + '\n'
+            message = f"\n\na: {test_file}" + '\n'
+            message += f"b: {reference_file}" + '\n'
             message += exc.args[0]
             return False, message
         else:
@@ -240,18 +240,24 @@ def wrap_array_interceptor(plugin, item):
     # Only intercept array on marked array tests
     if item.get_closest_marker('array_compare') is not None:
 
+        # Guard against wrapping more than once (e.g. when pytest-run-parallel
+        # runs the same item multiple times).
+        if getattr(item.obj, '_arraydiff_wrapped', False):
+            return
+
         # Use the full test name as a key to ensure correct array is being retrieved
         test_name = generate_test_name(item)
 
         def array_interceptor(store, obj):
             def wrapper(*args, **kwargs):
                 store.return_value[test_name] = obj(*args, **kwargs)
+            wrapper._arraydiff_wrapped = True
             return wrapper
 
         item.obj = array_interceptor(plugin, item.obj)
 
 
-class ArrayComparison(object):
+class ArrayComparison:
 
     def __init__(self, config, reference_dir=None, generate_dir=None, default_format='text'):
         self.config = config
@@ -260,6 +266,10 @@ class ArrayComparison(object):
         self.default_format = default_format
         self.return_value = {}
 
+    def pytest_collection_modifyitems(self, items):
+        for item in items:
+            wrap_array_interceptor(self, item)
+
     @pytest.hookimpl(hookwrapper=True)
     def pytest_runtest_call(self, item):
 
@@ -272,7 +282,7 @@ class ArrayComparison(object):
         file_format = compare.kwargs.get('file_format', self.default_format)
 
         if file_format not in FORMATS:
-            raise ValueError("Unknown format: {0}".format(file_format))
+            raise ValueError(f"Unknown format: {file_format}")
 
         if 'extension' in compare.kwargs:
             extension = compare.kwargs['extension']
@@ -298,8 +308,6 @@ class ArrayComparison(object):
 
         baseline_remote = reference_dir.startswith('http')
 
-        # Run test and get array object
-        wrap_array_interceptor(self, item)
         yield
         test_name = generate_test_name(item)
         if test_name not in self.return_value:
@@ -372,11 +380,6 @@ class ArrayInterceptor:
         self.config = config
         self.return_value = {}
 
-    @pytest.hookimpl(hookwrapper=True)
-    def pytest_runtest_call(self, item):
-
-        if item.get_closest_marker('array_compare') is not None:
+    def pytest_collection_modifyitems(self, items):
+        for item in items:
             wrap_array_interceptor(self, item)
-
-        yield
-        return

pytest_arraydiff-0.7.0/pytest_arraydiff/version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '0.7.0'
+__version_tuple__ = version_tuple = (0, 7, 0)
+
+__commit_id__ = commit_id = 'gfa97f5625'

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/pytest_arraydiff.egg-info/PKG-INFO

@@ -1,37 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-arraydiff
-Version: 0.6.1
+Version: 0.7.0
 Summary: pytest plugin to help with comparing array output from tests
 Home-page: https://github.com/astropy/pytest-arraydiff
 Author: The Astropy Developers
 Author-email: astropy.team@gmail.com
-License: BSD
+License: BSD-3-Clause
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Utilities
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: pytest>=4.6
+Requires-Dist: pytest>=6.2
 Requires-Dist: numpy
 Provides-Extra: test
 Requires-Dist: astropy; extra == "test"
 Requires-Dist: pandas; extra == "test"
-Requires-Dist: tables; extra == "test"
+Provides-Extra: test-hdf5
+Requires-Dist: tables; platform_machine != "arm64" and extra == "test-hdf5"
+Dynamic: license-file
 
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.5811772.svg
    :target: https://doi.org/10.5281/zenodo.5811772

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/pytest_arraydiff.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ pyproject.toml
 setup.cfg
 setup.py
 tox.ini
+.github/dependabot.yml
 .github/workflows/ci_workflows.yml
 pytest_arraydiff/__init__.py
 pytest_arraydiff/plugin.py
@@ -18,6 +19,7 @@ pytest_arraydiff.egg-info/entry_points.txt
 pytest_arraydiff.egg-info/not-zip-safe
 pytest_arraydiff.egg-info/requires.txt
 pytest_arraydiff.egg-info/top_level.txt
+tests/conftest.py
 tests/test_pytest_arraydiff.py
 tests/baseline/test_absolute_tolerance.fits
 tests/baseline/test_relative_tolerance.fits

pytest_arraydiff-0.7.0/pytest_arraydiff.egg-info/requires.txt

@@ -0,0 +1,11 @@
+pytest>=6.2
+numpy
+
+[test]
+astropy
+pandas
+
+[test_hdf5]
+
+[test_hdf5:platform_machine != "arm64"]
+tables

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/setup.cfg

@@ -3,25 +3,24 @@ name = pytest-arraydiff
 url = https://github.com/astropy/pytest-arraydiff
 author = The Astropy Developers
 author_email = astropy.team@gmail.com
+license = BSD-3-Clause
+license_files = LICENSE
 classifiers = 
 	Development Status :: 4 - Beta
 	Framework :: Pytest
 	Intended Audience :: Developers
-	License :: OSI Approved :: BSD License
 	Operating System :: OS Independent
 	Programming Language :: Python
 	Programming Language :: Python :: 3
 	Programming Language :: Python :: 3 :: Only
-	Programming Language :: Python :: 3.7
-	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12
+	Programming Language :: Python :: 3.13
 	Programming Language :: Python :: Implementation :: CPython
 	Topic :: Software Development :: Testing
 	Topic :: Utilities
-license = BSD
 description = pytest plugin to help with comparing array output from tests
 long_description = file: README.rst
 long_description_content_type = text/x-rst
@@ -29,32 +28,32 @@ long_description_content_type = text/x-rst
 [options]
 zip_safe = False
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.9
 setup_requires = 
 	setuptools_scm
 install_requires = 
-	pytest>=4.6
+	pytest>=6.2
 	numpy
 
 [options.extras_require]
 test = 
 	astropy
 	pandas
-	tables
+test_hdf5 = 
+	tables;platform_machine!='arm64'
 
 [options.entry_points]
 pytest11 = 
 	pytest_arraydiff = pytest_arraydiff.plugin
 
 [tool:pytest]
-minversion = 4.6
+minversion = 6.2
 testpaths = tests
 xfail_strict = true
 markers = 
 	array_compare: for functions using array comparison
 filterwarnings = 
 	error
-	ignore:distutils Version classes are deprecated
 
 [flake8]
 max-line-length = 150

pytest_arraydiff-0.7.0/tests/conftest.py

@@ -0,0 +1 @@
+pytest_plugins = ["pytester"]

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/tests/test_pytest_arraydiff.py

@@ -24,6 +24,7 @@ def test_succeeds_func_text():
 @pytest.mark.skipif(not NUMPY_LT_2_0, reason="AttributeError: `np.unicode_` was removed in the NumPy 2.0 release. Use `np.str_` instead.")
 @pytest.mark.array_compare(file_format='pd_hdf', reference_dir=reference_dir)
 def test_succeeds_func_pdhdf():
+    pytest.importorskip('tables')  # Need this "optional" dependency
     pd = pytest.importorskip('pandas')
     return pd.DataFrame(data=np.arange(20, dtype='int64'),
                         columns=['test_data'])
@@ -40,7 +41,7 @@ def test_succeeds_func_fits_hdu():
     return fits.PrimaryHDU(np.arange(3 * 5).reshape((3, 5)).astype(np.int64))
 
 
-class TestClass(object):
+class TestClass:
 
     @pytest.mark.array_compare(file_format='fits', reference_dir=reference_dir)
     def test_succeeds_class(self):
@@ -66,11 +67,11 @@ def test_fails():
         f.write(TEST_FAILING)
 
     # If we use --arraydiff, it should detect that the file is missing
-    code = subprocess.call('pytest --arraydiff {0}'.format(test_file), shell=True)
+    code = subprocess.call(f'pytest --arraydiff {test_file}', shell=True)
     assert code != 0
 
     # If we don't use --arraydiff option, the test should succeed
-    code = subprocess.call('pytest {0}'.format(test_file), shell=True)
+    code = subprocess.call(f'pytest {test_file}', shell=True)
     assert code == 0
 
 
@@ -102,7 +103,7 @@ def test_generate(file_format):
         assert b'File not found for comparison test' in grepexc.output
 
     # If we do generate, the test should succeed and a new file will appear
-    code = subprocess.call(['pytest', '--arraydiff-generate-path={0}'.format(gen_dir), test_file],
+    code = subprocess.call(['pytest', f'--arraydiff-generate-path={gen_dir}', test_file],
                            timeout=10)
     assert code == 0
     assert os.path.exists(os.path.join(gen_dir, 'test_gen.' + ('fits' if file_format == 'fits' else 'txt')))
@@ -130,8 +131,8 @@ def test_default_format(file_format):
     gen_dir = os.path.join(tmpdir, 'spam', 'egg')
 
     # If we do generate, the test should succeed and a new file will appear
-    code = subprocess.call('pytest -s --arraydiff-default-format={0}'
-                           ' --arraydiff-generate-path={1} {2}'.format(file_format, gen_dir, test_file), shell=True)
+    code = subprocess.call('pytest -s --arraydiff-default-format={}'
+                           ' --arraydiff-generate-path={} {}'.format(file_format, gen_dir, test_file), shell=True)
     assert code == 0
     assert os.path.exists(os.path.join(gen_dir, 'test_default.' + ('fits' if file_format == 'fits' else 'txt')))
 
@@ -176,3 +177,32 @@ class TestSingleReferenceClass:
 
 def test_nofile():
     pass
+
+
+TEST_PARALLEL = """
+import pytest
+import numpy as np
+from astropy.io import fits
+@pytest.mark.array_compare(file_format='fits')
+def test_parallel():
+    return fits.PrimaryHDU(np.arange(3 * 5).reshape((3, 5)).astype(np.int64))
+"""
+
+
+def test_parallel_iterations(pytester):
+    """Regression test: arraydiff should work with pytest-run-parallel."""
+    pytest.importorskip('pytest_run_parallel')
+
+    pytester.makepyfile(test_parallel=TEST_PARALLEL)
+    gen_dir = pytester.path / 'reference'
+
+    # Generate the reference file first
+    result = pytester.runpytest_subprocess(f'--arraydiff-generate-path={gen_dir}')
+    assert result.ret == 0
+
+    # Now run with --arraydiff and multiple iterations
+    result = pytester.runpytest_subprocess(
+        '--arraydiff', f'--arraydiff-reference-path={gen_dir}',
+        '--parallel-threads=2', '--iterations=3',
+    )
+    assert result.ret == 0

{pytest-arraydiff-0.6.1 → pytest_arraydiff-0.7.0}/tox.ini

@@ -1,30 +1,27 @@
 [tox]
 envlist =
-    py{37,38,39,310,311,312}-test{,-pytestoldest,-pytest50,-pytest52,-pytest53,-pytest60,-pytest61,-pytest62,-pytest70,-pytest71,-pytest72,-pytest73,-pytest74,-devdeps}
+    py{39,310,311,312,313,314}-test{,-pytest62,-pytest70,-pytest71,-pytest72,-pytest73,-pytest74,-devdeps}
+    py{313t,314t}-test{,-parallel}
     codestyle
-requires =
-    setuptools >= 30.3.0
-    pip >= 19.3.1
 isolated_build = true
 
 [testenv]
 changedir = .tmp/{envname}
 setenv =
+    py313t,py314t: PYTHON_GIL = 0
     devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/liberfa/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
 description = run tests
 deps =
-    pytestoldest: pytest==4.6.0
-    pytest50: pytest==5.0.*
-    pytest52: pytest==5.2.*
-    pytest53: pytest==5.3.*
-    pytest60: pytest==6.0.*
-    pytest61: pytest==6.1.*
     pytest62: pytest==6.2.*
     pytest70: pytest==7.0.*
     pytest71: pytest==7.1.*
     pytest72: pytest==7.2.*
     pytest73: pytest==7.3.*
     pytest74: pytest==7.4.*
+    pytest80: pytest==8.0.*
+    pytest83: pytest==8.3.*
+    pytest90: pytest==9.0.*
+    parallel: pytest-run-parallel
     devdeps: git+https://github.com/pytest-dev/pytest#egg=pytest
     devdeps: numpy>=0.0.dev0
     devdeps: pandas>=0.0.dev0
@@ -32,6 +29,10 @@ deps =
     devdeps: astropy>=0.0.dev0
 extras =
     test
+    # tables (PyTables) is needed for the pandas/HDF5 file_format, but
+    # has no free-threaded wheels and its sdist requires libhdf5-dev,
+    # which CI does not install. Only run these test on GIL-enabled builds.
+    !py313t-!py314t: test_hdf5
 commands =
     # Force numpy-dev after something in the stack downgrades it
     devdeps: python -m pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy

pytest-arraydiff-0.6.1/pytest_arraydiff/version.py

@@ -1,16 +0,0 @@
-# file generated by setuptools_scm
-# don't change, don't track in version control
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple, Union
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '0.6.1'
-__version_tuple__ = version_tuple = (0, 6, 1)

pytest-arraydiff-0.6.1/pytest_arraydiff.egg-info/requires.txt

@@ -1,7 +0,0 @@
-pytest>=4.6
-numpy
-
-[test]
-astropy
-pandas
-tables