Merge branch 'main' into fix-known-args-namespace-duplicate

EternalRights · web-flow · commit e576b52dead1 · 2026-04-26T17:12:00.000+08:00
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -64,7 +64,7 @@ jobs:
         tox -e generate-gh-release-notes -- "$VERSION" gh-release-notes.md
 
     - name: Upload release notes
-      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
       with:
         name: release-notes
         path: gh-release-notes.md
@@ -88,7 +88,7 @@ jobs:
         path: dist
 
     - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
+      uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b
       with:
         attestations: true
 
diff --git a/.github/workflows/update-plugin-list.yml b/.github/workflows/update-plugin-list.yml
@@ -31,7 +31,7 @@ jobs:
           python-version: "3.13"
 
       - name: requests-cache
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.cache/pytest-plugin-list/
           key: plugins-http-cache-${{ github.run_id }} # Can use time based key as well
@@ -47,7 +47,7 @@ jobs:
 
       - name: Create Pull Request
         id: pr
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1
         with:
           commit-message: '[automated] Update plugin list'
           author: 'pytest bot <pytestbot@users.noreply.github.com>'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 minimum_pre_commit_version: "4.4.0"
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.15.10"
+  rev: "v0.15.11"
   hooks:
     - id: ruff-check
       args: ["--fix"]
diff --git a/AUTHORS b/AUTHORS
@@ -180,6 +180,7 @@ Fraser Stark
 Freya Bruhin
 Gabriel Landau
 Gabriel Reis
+Garion Milazzo
 Garvit Shubham
 Gene Wood
 George Kussumoto
diff --git a/changelog/14234.bugfix.rst b/changelog/14234.bugfix.rst
@@ -0,0 +1 @@
+Allow :ref:`pytest.HIDDEN_PARAM <hidden-param>` in :ref:`@pytest.mark.parametrize(ids=...) <pytest.mark.parametrize ref>` typing.
diff --git a/changelog/14381.bugfix.rst b/changelog/14381.bugfix.rst
@@ -0,0 +1 @@
+Fixed ``-V`` (short form of ``--version``) to properly display the current version.
diff --git a/changelog/14389.bugfix.rst b/changelog/14389.bugfix.rst
@@ -0,0 +1 @@
+Improved :func:`pytest.raises(..., match=...) <pytest.raises>` failures to suppress the mismatched exception as a cause of the resulting ``AssertionError``.
diff --git a/changelog/14392.bugfix.rst b/changelog/14392.bugfix.rst
@@ -0,0 +1 @@
+Fixed a bug in :func:`pytest.raises(match=...) <pytest.raises>` "fully escaped" detection, causing the regex diff display to be shown in some instances when the raw string diff display should be shown instead.
diff --git a/doc/en/reference/plugin_list.rst b/doc/en/reference/plugin_list.rst
diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
@@ -184,9 +184,12 @@ def main(
 
     :returns: An exit code.
     """
-    # Handle a single `--version` argument early to avoid starting up the entire pytest infrastructure.
+    # Handle a single `--version`/`-V` argument early to avoid starting up the entire pytest infrastructure.
     new_args = sys.argv[1:] if args is None else args
-    if isinstance(new_args, Sequence) and new_args.count("--version") == 1:
+    if (
+        isinstance(new_args, Sequence)
+        and (new_args.count("--version") + new_args.count("-V")) == 1
+    ):
         sys.stdout.write(f"pytest {__version__}\n")
         return ExitCode.OK
 
diff --git a/src/_pytest/mark/structures.py b/src/_pytest/mark/structures.py
@@ -532,7 +532,7 @@ def __call__(
             argvalues: Collection[ParameterSet | Sequence[object] | object],
             *,
             indirect: bool | Sequence[str] = ...,
-            ids: Iterable[None | str | float | int | bool]
+            ids: Iterable[None | str | float | int | bool | _HiddenParam]
             | Callable[[Any], object | None]
             | None = ...,
             scope: ScopeName | None = ...,
diff --git a/src/_pytest/raises.py b/src/_pytest/raises.py
@@ -345,9 +345,10 @@ def _check_raw_type(
 def is_fully_escaped(s: str) -> bool:
     # we know we won't compile with re.VERBOSE, so whitespace doesn't need to be escaped
     metacharacters = "{}()+.*?^$[]|"
-    return not any(
-        c in metacharacters and (i == 0 or s[i - 1] != "\\") for (i, c) in enumerate(s)
-    )
+    # Strip all escape sequences (backslash + any char), then check if any
+    # metacharacter remains unescaped in the resulting string.
+    stripped = re.sub(r"\\.", "", s)
+    return not any(c in metacharacters for c in stripped)
 
 
 def unescape(s: str) -> str:
@@ -698,7 +699,7 @@ def __exit__(
         if not self.matches(exc_val):
             if self._just_propagate:
                 return False
-            raise AssertionError(self._fail_reason)
+            raise AssertionError(self._fail_reason) from None
 
         # Cast to narrow the exception type now that it's verified....
         # even though the TypeGuard in self.matches should be narrowing
diff --git a/src/_pytest/runner.py b/src/_pytest/runner.py
@@ -158,7 +158,7 @@ def show_test_item(item: Item) -> None:
     tw.write(item.nodeid)
     used_fixtures = sorted(getattr(item, "fixturenames", []))
     if used_fixtures:
-        tw.write(" (fixtures used: {})".format(", ".join(used_fixtures)))
+        tw.write(f" (fixtures used: {', '.join(used_fixtures)})")
     tw.flush()
 
 
diff --git a/testing/python/raises.py b/testing/python/raises.py
@@ -179,6 +179,33 @@ def test_invalid_regex():
         result.stdout.no_fnmatch_line("*File*")
         result.stdout.no_fnmatch_line("*line*")
 
+    def test_raises_match_failure_suppresses_exception_context(
+        self, pytester: Pytester
+    ) -> None:
+        pytester.makepyfile(
+            """
+            import pytest
+
+            def test_raises_match_failure():
+                with pytest.raises(ValueError, match="expected"):
+                    raise ValueError("actual")
+            """
+        )
+        result = pytester.runpytest("--tb=short")
+        assert result.ret == 1
+        result.stdout.fnmatch_lines(
+            [
+                "*E*AssertionError: Regex pattern did not match.*",
+            ]
+        )
+        result.stdout.no_fnmatch_line("*ValueError: actual")
+        result.stdout.no_fnmatch_line(
+            "*The above exception was the direct cause of the following exception:*"
+        )
+        result.stdout.no_fnmatch_line(
+            "*During handling of the above exception, another exception occurred:*"
+        )
+
     def test_noclass(self) -> None:
         with pytest.raises(TypeError):
             with pytest.raises("wrong"):  # type: ignore[call-overload]
@@ -444,3 +471,19 @@ def test_pipe_is_treated_as_regex_metacharacter(self) -> None:
         assert not is_fully_escaped("foo|bar")
         assert is_fully_escaped(r"foo\|bar")
         assert unescape(r"foo\|bar") == "foo|bar"
+
+    def test_consecutive_backslashes_in_escape_check(self) -> None:
+        """Consecutive backslashes escape each other, leaving the metachar unescaped."""
+        from _pytest.raises import is_fully_escaped
+
+        # r"\."  -> one backslash escapes the dot -> fully escaped
+        assert is_fully_escaped(r"\.")
+        # r"\\." -> two backslashes: the first escapes the second, dot is unescaped
+        assert not is_fully_escaped(r"\\.")
+        # r"\\\." -> three backslashes: pair escapes pair, last escapes dot -> fully escaped
+        assert is_fully_escaped(r"\\\.")
+        # Same idea with pipe metachar
+        # "\\\\|" is the string \\| (2 backslashes + pipe): even count, pipe is unescaped
+        assert not is_fully_escaped("\\\\|")
+        # r"\\\\|" is the string \\\\| (4 backslashes + pipe): even count, pipe is unescaped
+        assert not is_fully_escaped(r"\\\\|")
diff --git a/testing/test_helpconfig.py b/testing/test_helpconfig.py
@@ -16,10 +16,11 @@ def test_version_verbose(pytester: Pytester, pytestconfig, monkeypatch) -> None:
         result.stdout.fnmatch_lines(["*registered third-party plugins:", "*at*"])
 
 
-def test_version_less_verbose(pytester: Pytester) -> None:
-    """Single ``--version`` parameter should display only the pytest version, without loading plugins (#13574)."""
+@pytest.mark.parametrize("flag", ["--version", "-V"])
+def test_version_less_verbose(pytester: Pytester, flag: str) -> None:
+    """Single ``--version`` or ``-V`` should display only the pytest version, without loading plugins (#13574)."""
     pytester.makeconftest("print('This should not be printed')")
-    result = pytester.runpytest_subprocess("--version")
+    result = pytester.runpytest_subprocess(flag)
     assert result.ret == ExitCode.OK
     assert result.stdout.str().strip() == f"pytest {pytest.__version__}"
 
diff --git a/testing/typing_checks.py b/testing/typing_checks.py
@@ -61,6 +61,12 @@ def check_testreport_attributes(report: TestReport) -> None:
     assert_type(report.location, tuple[str, int | None, str])
 
 
+# Issue #14234.
+@pytest.mark.parametrize("x", [1, 2], ids=[pytest.HIDDEN_PARAM, "visible"])
+def test_hidden_param(x: int) -> None:
+    pass
+
+
 # Test @pytest.mark.parametrize iterator argvalues deprecation.
 # Will be complain about unused type ignore if doesn't work.
 @pytest.mark.parametrize("x", iter(range(10)))  # type: ignore[deprecated]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Allow :ref:`pytest.HIDDEN_PARAM <hidden-param>` in :ref:`@pytest.mark.parametrize(ids=...) <pytest.mark.parametrize ref>` typing.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed ``-V`` (short form of ``--version``) to properly display the current version.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Improved :func:`pytest.raises(..., match=...) <pytest.raises>` failures to suppress the mismatched exception as a cause of the resulting ``AssertionError``.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed a bug in :func:`pytest.raises(match=...) <pytest.raises>` "fully escaped" detection, causing the regex diff display to be shown in some instances when the raw string diff display should be shown instead.