pytest-arraydiff 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

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:
@@ -310,8 +318,10 @@ class ArrayComparison(object):
         # Find test name to use as plot name
         filename = compare.kwargs.get('filename', None)
         if filename is None:
-            filename = item.name + '.' + extension
-            if not single_reference:
+            if single_reference:
+                filename = item.originalname + '.' + extension
+            else:
+                filename = item.name + '.' + extension
                 filename = filename.replace('[', '_').replace(']', '_')
                 filename = filename.replace('_.' + extension, '.' + extension)
 
@@ -370,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/version.py

@@ -1,16 +1,34 @@
-# file generated by setuptools_scm
+# 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, Union
+    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)
 
-__version__ = version = '0.6.0'
-__version_tuple__ = version_tuple = (0, 6, 0)
+__commit_id__ = commit_id = 'gfa97f5625'

{pytest_arraydiff-0.6.0.dist-info → pytest_arraydiff-0.7.0.dist-info}/METADATA

@@ -1,37 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-arraydiff
-Version: 0.6.0
+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'
+Requires-Dist: astropy; extra == "test"
+Requires-Dist: pandas; 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
@@ -41,6 +41,10 @@ Requires-Dist: tables ; extra == 'test'
     :target: https://github.com/astropy/pytest-arraydiff/actions
     :alt: CI Status
 
+.. image:: https://img.shields.io/pypi/v/pytest-arraydiff.svg
+    :target: https://pypi.org/project/pytest-arraydiff
+    :alt: PyPI Status
+
 About
 -----
 

pytest_arraydiff-0.7.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+pytest_arraydiff/__init__.py,sha256=ICVlMfJSyUfBfTrbT0iaRCQuzdTOdpNCGyxVOwgxXzQ,117
+pytest_arraydiff/plugin.py,sha256=xRBTe_c9tpp-Kxc9B-DuMbYUiKTIhSNWhGx7NJHX-MI,13478
+pytest_arraydiff/version.py,sha256=5yXdxnHKW7crIY91N88sJ7d_GLHu4QN6TQTZj0sr8bE,712
+pytest_arraydiff-0.7.0.dist-info/licenses/LICENSE,sha256=sx9xdEnc-QGbdeT_denLAE1qpXXXIO0qP2TRH-4sKe8,1448
+pytest_arraydiff-0.7.0.dist-info/METADATA,sha256=hXLxmXTKgFpust5iisDJkQQUJacoHWZ3J4WaRuymcWU,8535
+pytest_arraydiff-0.7.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+pytest_arraydiff-0.7.0.dist-info/entry_points.txt,sha256=1mmqAdBTczR-Jj1RtaLXIdnibdhQBqaNCzRSaxhTRpk,54
+pytest_arraydiff-0.7.0.dist-info/top_level.txt,sha256=7fVOoIyJHVuSQkxQKVkfifGCXbQoyqMWSgzmwEBeegQ,17
+pytest_arraydiff-0.7.0.dist-info/RECORD,,

{pytest_arraydiff-0.6.0.dist-info → pytest_arraydiff-0.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pytest_arraydiff-0.6.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-pytest_arraydiff/__init__.py,sha256=ICVlMfJSyUfBfTrbT0iaRCQuzdTOdpNCGyxVOwgxXzQ,117
-pytest_arraydiff/plugin.py,sha256=ikhC5Pchm5WafjWA9LZYYXrcpvd63LXiX4cqh3Tt_tU,13261
-pytest_arraydiff/version.py,sha256=2JKwcA-YQ0okV2N-gwTWy_n51igWrPcsKQFm0cnqsvw,411
-pytest_arraydiff-0.6.0.dist-info/LICENSE,sha256=sx9xdEnc-QGbdeT_denLAE1qpXXXIO0qP2TRH-4sKe8,1448
-pytest_arraydiff-0.6.0.dist-info/METADATA,sha256=0adcJqjMVVKqtLMF-R-xLhMSAW8bY6VKRizZ6DNbPAM,8405
-pytest_arraydiff-0.6.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-pytest_arraydiff-0.6.0.dist-info/entry_points.txt,sha256=1mmqAdBTczR-Jj1RtaLXIdnibdhQBqaNCzRSaxhTRpk,54
-pytest_arraydiff-0.6.0.dist-info/top_level.txt,sha256=7fVOoIyJHVuSQkxQKVkfifGCXbQoyqMWSgzmwEBeegQ,17
-pytest_arraydiff-0.6.0.dist-info/RECORD,,