pytest-regtest 2.3.3__tar.gz → 2.3.5__tar.gz

{pytest_regtest-2.3.3/src/pytest_regtest.egg-info → pytest_regtest-2.3.5}/PKG-INFO

@@ -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
+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.3 → pytest_regtest-2.3.5}/pyproject.toml

@@ -6,14 +6,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytest-regtest"
-version = "2.3.3"
+version = "2.3.5"
 description = "pytest plugin for snapshot regression testing"
 readme = "README.md"
 authors = [
   {name = "Uwe Schmitt", email = "uwe.schmitt@id.ethz.ch"}
 ]
 
-license = {text = "MIT License"}
+license = "MIT"
 
 classifiers = [
     "Intended Audience :: Developers",
@@ -21,7 +21,6 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
-    "License :: OSI Approved :: MIT License"
 ]
 
 dependencies = [
@@ -43,11 +42,28 @@ exclude = ["_regtest_output"]
 [tool.ruff.lint]
 ignore = ["E731", "E203"]
 
-[tool.uv]
-dev-dependencies = [
-    "twine", "build", "hatchling", "wheel", "pre-commit", "ruff", "black",
-    "pytest-cov", "numpy", "pandas", "mkdocs", "mkdocs-material", "mistletoe",
-    "mkdocs-awesome-pages-plugin", "jinja2-cli", "mkdocstrings[python]",
-    "numpy>=2", "pandas>=2", "polars>=1.9",
-    "md-transformer>=0.0.3"
+[dependency-groups]
+dev = [
+    "pandas>=2.2.3",
+    "twine",
+    "build",
+    "hatchling",
+    "wheel",
+    "pre-commit",
+    "ruff",
+    "black",
+    "pytest-cov",
+    "numpy",
+    "pandas",
+    "mkdocs",
+    "mkdocs-material",
+    "mistletoe",
+    "mkdocs-awesome-pages-plugin",
+    "jinja2-cli",
+    "mkdocstrings[python]",
+    "numpy>=2",
+    "pandas>=2",
+    "polars>=1.9",
+    "md-transformer>=0.0.3",
+    "pdbp>=1.7.1",
 ]

{pytest_regtest-2.3.3 → pytest_regtest-2.3.5}/src/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-2.3.3 → pytest_regtest-2.3.5}/src/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-2.3.3 → pytest_regtest-2.3.5}/src/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-2.3.3 → pytest_regtest-2.3.5}/src/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 → pytest_regtest-2.3.5/src/pytest_regtest.egg-info}/PKG-INFO

@@ -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
+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.3 → pytest_regtest-2.3.5}/tests/conftest.py

@@ -1,6 +1,7 @@
 import sys
 
 import numpy
+import pdbp  # noqa
 import pytest
 
 # hack to disable reload numpy in pytester (current code only prevent reload of

{pytest_regtest-2.3.3 → pytest_regtest-2.3.5}/tests/test_regtest.py

@@ -135,11 +135,13 @@ def test_xfail(testdir, assert_outcomes):
     result = testdir.runpytest()
     assert_outcomes(result, xfailed=1)
 
+    # With --regtest-reset, xfail tests are not reset (output not recorded)
     result = testdir.runpytest("--regtest-reset")
     assert_outcomes(result, xfailed=1)
 
+    # Run again - still xfailed because no output was recorded
     result = testdir.runpytest()
-    assert_outcomes(result, xpassed=1)
+    assert_outcomes(result, xfailed=1)
 
 
 def test_xfail_strict(testdir, assert_outcomes):
@@ -161,11 +163,56 @@ def test_xfail_strict(testdir, assert_outcomes):
     result = testdir.runpytest()
     assert_outcomes(result, failed=0, passed=0, xfailed=1)
 
+    # With --regtest-reset, xfail tests are not reset (output not recorded)
     result = testdir.runpytest("--regtest-reset")
     assert_outcomes(result, xfailed=1)
 
+    # Run again - still xfailed because no output was recorded
+    # With strict=True, an xpass would become a failure, but this stays xfailed
     result = testdir.runpytest()
-    assert_outcomes(result, failed=1)
+    assert_outcomes(result, xfailed=1)
+
+
+def test_conditional_xfail(testdir, assert_outcomes):
+    testdir.makepyfile(
+        """
+        import sys
+        import pytest
+
+        @pytest.mark.xfail(condition=sys.platform == "win32", reason="Windows only")
+        def test_conditional_xfail_windows(regtest_all):
+            print("This test is xfailed on Windows only")
+            print(f"Platform: {sys.platform}")
+            # This should pass on non-Windows
+
+        @pytest.mark.xfail(condition=sys.platform != "win32", reason="Non-Windows only")
+        def test_conditional_xfail_non_windows(regtest_all):
+            print("This test is xfailed on non-Windows only")
+            print(f"Platform: {sys.platform}")
+            # This should pass on Windows
+         """
+    )
+
+    # Run initially - one should fail (no recorded output), one should xfail
+    result = testdir.runpytest()
+    assert_outcomes(result, failed=1, xfailed=1)
+
+    # Run with --regtest-reset
+    # xfail tests should NOT be reset - they run but output is not recorded
+    # The non-xfailed test gets reset, the xfailed one still fails (no output file)
+    result = testdir.runpytest("--regtest-reset")
+    if IS_WIN:
+        # On Windows: test_windows is xfailed, test_non_windows gets reset
+        assert_outcomes(result, passed=1, xfailed=1)
+    else:
+        # On non-Windows: test_windows gets reset, test_non_windows is xfailed
+        assert_outcomes(result, passed=1, xfailed=1)
+
+    # Run again to verify
+    # The non-xfailed test should pass (was reset)
+    # The xfailed test should still fail (no output file was created)
+    result = testdir.runpytest()
+    assert_outcomes(result, passed=1, xfailed=1)
 
 
 def test_failed_test(testdir, assert_outcomes):