Merge branch 'main' into disable_assertion_rewriting_external_modules

Author: Tusenka

.github/workflows/deploy.yml

@@ -31,7 +31,7 @@ jobs:
         persist-credentials: false
 
     - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v2.12.0
+      uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310
       with:
         attest-build-provenance-github: 'true'
 
@@ -56,7 +56,7 @@ jobs:
         path: dist
 
     - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.12.4
+      uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
       with:
         attestations: true
 
@@ -109,7 +109,7 @@ jobs:
         tox -e generate-gh-release-notes -- "$VERSION" scripts/latest-release-notes.md
 
     - name: Publish GitHub Release
-      uses: softprops/action-gh-release@v2
+      uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
       with:
         body_path: scripts/latest-release-notes.md
         files: dist/*

.github/workflows/test.yml

@@ -40,7 +40,7 @@ jobs:
         fetch-depth: 0
         persist-credentials: false
     - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v2.12.0
+      uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310
 
   build:
     needs: [package]
@@ -262,7 +262,7 @@ jobs:
 
     - name: Upload coverage to Codecov
       if: "matrix.use_coverage"
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d
       with:
         fail_ci_if_error: false
         files: ./coverage.xml

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.11.5"
+  rev: "v0.11.10"
   hooks:
     - id: ruff
       args: ["--fix"]
@@ -12,7 +12,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
 - repo: https://github.com/woodruffw/zizmor-pre-commit
-  rev: v1.5.2
+  rev: v1.7.0
   hooks:
     - id: zizmor
 -   repo: https://github.com/adamchainz/blacken-docs

changelog/13420.bugfix.rst

@@ -0,0 +1 @@
+Added ``lru_cache`` to ``nodes._check_initialpaths_for_relpath``.

changelog/5473.improvement.rst

@@ -0,0 +1 @@
+Replace `:` with `;` in the assertion rewrite warning message so it can be filtered using standard Python warning filters before calling :func:`pytest.main`.

doc/en/reference/plugin_list.rst

@@ -282,7 +282,7 @@ def _warn_already_imported(self, name: str) -> None:
 
         self.config.issue_config_time_warning(
             PytestAssertRewriteWarning(
-                f"Module already imported so cannot be rewritten: {name}"
+                f"Module already imported so cannot be rewritten; {name}"
             ),
             stacklevel=5,
         )

src/_pytest/assertion/rewrite.py

@@ -7,6 +7,7 @@
 from collections.abc import Iterator
 from collections.abc import MutableMapping
 from functools import cached_property
+from functools import lru_cache
 from inspect import signature
 import os
 import pathlib
@@ -543,8 +544,11 @@ def _traceback_filter(self, excinfo: ExceptionInfo[BaseException]) -> Traceback:
         return excinfo.traceback
 
 
-def _check_initialpaths_for_relpath(session: Session, path: Path) -> str | None:
-    for initial_path in session._initialpaths:
+@lru_cache(maxsize=1000)
+def _check_initialpaths_for_relpath(
+    initial_paths: frozenset[Path], path: Path
+) -> str | None:
+    for initial_path in initial_paths:
         if commonpath(path, initial_path) == initial_path:
             rel = str(path.relative_to(initial_path))
             return "" if rel == "." else rel
@@ -594,7 +598,7 @@ def __init__(
             try:
                 nodeid = str(self.path.relative_to(session.config.rootpath))
             except ValueError:
-                nodeid = _check_initialpaths_for_relpath(session, path)
+                nodeid = _check_initialpaths_for_relpath(session._initialpaths, path)
 
             if nodeid and os.sep != SEP:
                 nodeid = nodeid.replace(os.sep, SEP)

src/_pytest/nodes.py

@@ -1202,7 +1202,23 @@ def test_rewrite_warning(self, pytester: Pytester) -> None:
         )
         # needs to be a subprocess because pytester explicitly disables this warning
         result = pytester.runpytest_subprocess()
-        result.stdout.fnmatch_lines(["*Module already imported*: _pytest"])
+        result.stdout.fnmatch_lines(["*Module already imported*; _pytest"])
+
+    def test_rewrite_warning_ignore(self, pytester: Pytester) -> None:
+        pytester.makeconftest(
+            """
+            import pytest
+            pytest.register_assert_rewrite("_pytest")
+        """
+        )
+        # needs to be a subprocess because pytester explicitly disables this warning
+        result = pytester.runpytest_subprocess(
+            "-W",
+            "ignore:Module already imported so cannot be rewritten; _pytest:pytest.PytestAssertRewriteWarning",
+        )
+        # Previously, when the message pattern used to contain an extra `:`, an error was raised.
+        assert not result.stderr.str().strip()
+        result.stdout.no_fnmatch_line("*Module already imported*; _pytest")
 
     def test_rewrite_module_imported_from_conftest(self, pytester: Pytester) -> None:
         pytester.makeconftest(

testing/test_assertrewrite.py

@@ -3,7 +3,6 @@
 
 from pathlib import Path
 import re
-from typing import cast
 import warnings
 
 from _pytest import nodes
@@ -103,24 +102,15 @@ def test__check_initialpaths_for_relpath() -> None:
     """Ensure that it handles dirs, and does not always use dirname."""
     cwd = Path.cwd()
 
-    class FakeSession1:
-        _initialpaths = frozenset({cwd})
+    initial_paths = frozenset({cwd})
 
-    session = cast(pytest.Session, FakeSession1)
-
-    assert nodes._check_initialpaths_for_relpath(session, cwd) == ""
+    assert nodes._check_initialpaths_for_relpath(initial_paths, cwd) == ""
 
     sub = cwd / "file"
-
-    class FakeSession2:
-        _initialpaths = frozenset({cwd})
-
-    session = cast(pytest.Session, FakeSession2)
-
-    assert nodes._check_initialpaths_for_relpath(session, sub) == "file"
+    assert nodes._check_initialpaths_for_relpath(initial_paths, sub) == "file"
 
     outside = Path("/outside-this-does-not-exist")
-    assert nodes._check_initialpaths_for_relpath(session, outside) is None
+    assert nodes._check_initialpaths_for_relpath(initial_paths, outside) is None
 
 
 def test_failure_with_changed_cwd(pytester: Pytester) -> None: