pytest-regtest 2.3.3__py3-none-any.whl → 2.3.5__py3-none-any.whl

pytest_regtest/__init__.py

@@ -18,7 +18,6 @@ from .register_third_party_handlers import (
     register_pandas_handler,
     register_polars_handler,
 )
-
 from .snapshot_handler import register_python_object_handler
 
 __version__ = _version(__package__)

pytest_regtest/numpy_handler.py

@@ -145,8 +145,7 @@ class NumpyHandler(BaseSnapshotHandler):
             " entries"
         )
         lines.append(
-            f"up to given precision settings rtol={self.rtol:e} and"
-            f" atol={self.atol:e}"
+            f"up to given precision settings rtol={self.rtol:e} and atol={self.atol:e}"
         )
 
         return lines

pytest_regtest/pandas_handler.py

@@ -75,21 +75,16 @@ class DataFrameHandler(BaseSnapshotHandler):
         def extract(df, selector):
             return df[[n for (n, t) in zip(df.columns, df.dtypes) if selector(t)]]
 
-        current_reduced_floats = extract(
-            current_reduced, lambda t: t.type is np.float64
-        ).to_numpy()
+        def is_float(t):
+            return t.type in (np.float64, np.float32)
 
-        current_reduced_other = extract(
-            current_reduced, lambda t: t.type is not np.float64
-        )
+        current_reduced_floats = extract(current_reduced, is_float).to_numpy()
 
-        recorded_reduced_floats = extract(
-            recorded_reduced, lambda t: t.type is np.float64
-        ).to_numpy()
+        current_reduced_other = extract(current_reduced, lambda t: not is_float(t))
 
-        recorded_reduced_other = extract(
-            recorded_reduced, lambda t: t.type is not np.float64
-        )
+        recorded_reduced_floats = extract(recorded_reduced, is_float).to_numpy()
+
+        recorded_reduced_other = extract(recorded_reduced, lambda t: not is_float(t))
 
         return np.allclose(
             current_reduced_floats,
@@ -97,7 +92,7 @@ class DataFrameHandler(BaseSnapshotHandler):
             atol=self.atol,
             rtol=self.rtol,
             equal_nan=True,
-        ) and (current_reduced_other == recorded_reduced_other).all(axis=None)
+        ) and current_reduced_other.equals(recorded_reduced_other)
 
     def show_differences(self, current, recorded, has_markup):
         lines = []

pytest_regtest/pytest_regtest.py

@@ -108,10 +108,6 @@ class PytestRegtestPlugin:
             if output_exception is not None:
                 raise output_exception
 
-        if item.get_closest_marker("xfail") and item.config.getvalue("--regtest-reset"):
-            # enforce consistency with xfail:
-            assert False
-
     def check_recorded_output(self, item):
         test_folder = item.fspath.dirname
         regtest_stream = item.regtest_stream
@@ -127,6 +123,14 @@ class PytestRegtestPlugin:
         consider_line_endings = config.getvalue("--regtest-consider-line-endings")
         reset = config.getvalue("--regtest-reset")
 
+        # Skip reset for xfail tests that are actually expected to fail
+        xfail_marker = item.get_closest_marker("xfail")
+        if xfail_marker:
+            # Check if xfail condition evaluates to True
+            condition = xfail_marker.kwargs.get("condition", True)
+            if condition is True or (condition is not False and condition):
+                reset = False
+
         if reset:
             os.makedirs(os.path.dirname(recorded_output_path), exist_ok=True)
             with open(recorded_output_path + ".out", "w", encoding="utf-8") as fh:
@@ -252,10 +256,6 @@ class SnapshotPlugin:
             if snapshot_exception is not None:
                 raise snapshot_exception
 
-        if item.get_closest_marker("xfail") and item.config.getvalue("--regtest-reset"):
-            # enforce fail
-            assert False
-
     def check_snapshots(self, item):
         results = []
 
@@ -287,6 +287,14 @@ class SnapshotPlugin:
 
         reset = config.getvalue("--regtest-reset")
 
+        # Skip reset for xfail tests that are actually expected to fail
+        xfail_marker = item.get_closest_marker("xfail")
+        if xfail_marker:
+            # Check if xfail condition evaluates to True
+            condition = xfail_marker.kwargs.get("condition", True)
+            if condition is True or (condition is not False and condition):
+                reset = False
+
         if reset:
             os.makedirs(recorded_output_path, exist_ok=True)
             handler.save(recorded_output_path, obj)

{pytest_regtest-2.3.3.dist-info → pytest_regtest-2.3.5.dist-info}/METADATA

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-regtest
-Version: 2.3.3
+Version: 2.3.5
 Summary: pytest plugin for snapshot regression testing
 Author-email: Uwe Schmitt <uwe.schmitt@id.ethz.ch>
-License: MIT License
+License-Expression: MIT
 Project-URL: Source, https://gitlab.com/uweschmitt/pytest-regtest
 Project-URL: Documentation, https://pytest-regtest.readthedocs.org
 Classifier: Intended Audience :: Developers
@@ -11,10 +11,10 @@ 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: License :: OSI Approved :: MIT License
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pytest >7.2
+Requires-Dist: pytest>7.2
+Dynamic: license-file
 
 ![](https://gitlab.com/uweschmitt/pytest-regtest/badges/main/pipeline.svg)
 ![](https://gitlab.com/uweschmitt/pytest-regtest/badges/main/coverage.svg?job=coverage)

pytest_regtest-2.3.5.dist-info/RECORD

@@ -0,0 +1,14 @@
+pytest_regtest/__init__.py,sha256=GiURR8QAsu7GAVtbBEnwr1nNIcemLlcX7H5APQCb1ok,2535
+pytest_regtest/numpy_handler.py,sha256=iuCN4fPr8ldEPeS5henmfmGg7nhFDjLMisgwotpm5rA,7157
+pytest_regtest/pandas_handler.py,sha256=iDo5i5nSAYVWlOAps3pB3cbJmRvq1gHsWBF5y8f2M2c,4446
+pytest_regtest/polars_handler.py,sha256=G25GmzZo95MzHoehvKXiv-SV8TkKA4TnLEqQ-nZa3d8,3796
+pytest_regtest/pytest_regtest.py,sha256=c6k2NV-yWOecf4AjGgP1k_1oNXf5XD65aqqLYmRB5R8,22897
+pytest_regtest/register_third_party_handlers.py,sha256=mfmcyeMKuxFykkKLO7T1Tz5RPitn1pKLYRM7B9lA1Kg,1132
+pytest_regtest/snapshot_handler.py,sha256=MbWpNYOSkhQRs6U0qLT1kz5CV6JCay26yHntju8h9uU,6046
+pytest_regtest/utils.py,sha256=2jYTlV_qL5hH6FCeg7T1HJJvKual-Kux2scJ9_aB1lY,811
+pytest_regtest-2.3.5.dist-info/licenses/LICENSE.txt,sha256=Tue36uAzpW79-9WAqzkwPhsDDVd1X-VWUmdZ0MfGYvk,1068
+pytest_regtest-2.3.5.dist-info/METADATA,sha256=iMW7--UXXOHC0LILMuzLpF1BK3kCxph0rOkEUHRnS3U,3249
+pytest_regtest-2.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytest_regtest-2.3.5.dist-info/entry_points.txt,sha256=4VuIhXeMGhDo0ATbaUfyjND0atofmZjV_P-o6_uEk2s,36
+pytest_regtest-2.3.5.dist-info/top_level.txt,sha256=vnqUV6AhbIRzZqEfkFhZBBSMoo-tvRkYGeo4KKida1U,15
+pytest_regtest-2.3.5.dist-info/RECORD,,

{pytest_regtest-2.3.3.dist-info → pytest_regtest-2.3.5.dist-info}/WHEEL

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

pytest_regtest-2.3.3.dist-info/RECORD

@@ -1,14 +0,0 @@
-pytest_regtest/__init__.py,sha256=q3wEEi3ZZXaN5CXc0jKCeupbAl73t64Fz1pFNcYYPYo,2536
-pytest_regtest/numpy_handler.py,sha256=hKrVY9dId-45rUR_83w9jbUWgUhd0ABk8uLbOhgm0IM,7173
-pytest_regtest/pandas_handler.py,sha256=7vKaHyODcKMltgn9MbbbL1FsOBQK994dEY5fVlDoQ1g,4528
-pytest_regtest/polars_handler.py,sha256=G25GmzZo95MzHoehvKXiv-SV8TkKA4TnLEqQ-nZa3d8,3796
-pytest_regtest/pytest_regtest.py,sha256=anNCLTTRwe5dy7i_kcrLzeaiP1CskLDevn9FxYdAMJ4,22432
-pytest_regtest/register_third_party_handlers.py,sha256=mfmcyeMKuxFykkKLO7T1Tz5RPitn1pKLYRM7B9lA1Kg,1132
-pytest_regtest/snapshot_handler.py,sha256=MbWpNYOSkhQRs6U0qLT1kz5CV6JCay26yHntju8h9uU,6046
-pytest_regtest/utils.py,sha256=2jYTlV_qL5hH6FCeg7T1HJJvKual-Kux2scJ9_aB1lY,811
-pytest_regtest-2.3.3.dist-info/LICENSE.txt,sha256=Tue36uAzpW79-9WAqzkwPhsDDVd1X-VWUmdZ0MfGYvk,1068
-pytest_regtest-2.3.3.dist-info/METADATA,sha256=JWpJlvyy6SttnRPRePup4ySvc4MZS92LjuPDwWC8aCc,3276
-pytest_regtest-2.3.3.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-pytest_regtest-2.3.3.dist-info/entry_points.txt,sha256=4VuIhXeMGhDo0ATbaUfyjND0atofmZjV_P-o6_uEk2s,36
-pytest_regtest-2.3.3.dist-info/top_level.txt,sha256=vnqUV6AhbIRzZqEfkFhZBBSMoo-tvRkYGeo4KKida1U,15
-pytest_regtest-2.3.3.dist-info/RECORD,,