Merge branch 'main' into fix-13537

Author: gomri15

.github/workflows/test.yml

@@ -112,6 +112,7 @@ jobs:
             python: "3.10"
             os: windows-latest
             tox_env: "py310-pluggymain-pylib-xdist"
+            xfail: true
 
           - name: "windows-py310-xdist"
             python: "3.10"
@@ -132,6 +133,7 @@ jobs:
             python: "3.13"
             os: windows-latest
             tox_env: "py313"
+            xfail: true
 
           - name: "windows-py314"
             python: "3.14"
@@ -167,11 +169,13 @@ jobs:
             python: "3.10"
             os: ubuntu-latest
             tox_env: "py310-pluggymain-pylib-xdist"
+            xfail: true
 
           - name: "ubuntu-py310-freeze"
             python: "3.10"
             os: ubuntu-latest
             tox_env: "py310-freeze"
+            xfail: true
 
           - name: "ubuntu-py310-xdist"
             python: "3.10"
@@ -195,6 +199,7 @@ jobs:
             os: ubuntu-latest
             tox_env: "py313-pexpect"
             use_coverage: true
+            xfail: true
 
           - name: "ubuntu-py314"
             python: "3.14"
@@ -212,6 +217,7 @@ jobs:
             python: "3.10"
             os: macos-latest
             tox_env: "py310-xdist"
+            xfail: true
 
           - name: "macos-py312"
             python: "3.12"
@@ -222,6 +228,7 @@ jobs:
             python: "3.13"
             os: macos-latest
             tox_env: "py313-xdist"
+            xfail: true
 
           - name: "macos-py314"
             python: "3.14"
@@ -240,25 +247,7 @@ jobs:
             tox_env: "doctesting"
             use_coverage: true
 
-    continue-on-error: >-
-      ${{
-        contains(
-          fromJSON(
-            '[
-              "windows-py310-pluggy",
-              "windows-py313",
-              "ubuntu-py310-pluggy",
-              "ubuntu-py310-freeze",
-              "ubuntu-py313",
-              "macos-py310",
-              "macos-py313"
-            ]'
-          ),
-          matrix.name
-        )
-        && true
-        || false
-      }}
+    continue-on-error: ${{ matrix.xfail && true || false }}
 
     steps:
     - uses: actions/checkout@v5

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.12.12"
+  rev: "v0.13.1"
   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.12.1
+  rev: v1.13.0
   hooks:
     - id: zizmor
 -   repo: https://github.com/adamchainz/blacken-docs
@@ -32,7 +32,7 @@ repos:
     hooks:
     -   id: python-use-type-annotations
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.17.1
+    rev: v1.18.2
     hooks:
     -   id: mypy
         files: ^(src/|testing/|scripts/)

doc/en/example/.ruff.toml

@@ -0,0 +1 @@
+ignore = ["RUF059"]

src/_pytest/_code/source.py

@@ -103,7 +103,7 @@ def getstatementrange(self, lineno: int) -> tuple[int, int]:
         which containing the given lineno."""
         if not (0 <= lineno < len(self)):
             raise IndexError("lineno out of range")
-        ast, start, end = getstatementrange_ast(lineno, self)
+        _ast, start, end = getstatementrange_ast(lineno, self)
         return start, end
 
     def deindent(self) -> Source:

src/_pytest/_py/path.py

@@ -652,7 +652,7 @@ def new(self, **kw):
         if not kw:
             obj.strpath = self.strpath
             return obj
-        drive, dirname, basename, purebasename, ext = self._getbyspec(
+        drive, dirname, _basename, purebasename, ext = self._getbyspec(
             "drive,dirname,basename,purebasename,ext"
         )
         if "basename" in kw:

src/_pytest/config/__init__.py

@@ -1217,7 +1217,7 @@ def pytest_load_initial_conftests(self, early_config: Config) -> None:
         # early_config.args it not set yet. But we need it for
         # discovering the initial conftests. So "pre-run" the logic here.
         # It will be done for real in `parse()`.
-        args, args_source = early_config._decide_args(
+        args, _args_source = early_config._decide_args(
             args=early_config.known_args_namespace.file_or_dir,
             pyargs=early_config.known_args_namespace.pyargs,
             testpaths=early_config.getini("testpaths"),
@@ -1273,7 +1273,7 @@ def _consider_importhook(self, args: Sequence[str]) -> None:
         and find all the installed plugins to mark them for rewriting
         by the importhook.
         """
-        ns, unknown_args = self._parser.parse_known_and_unknown_args(args)
+        ns, _unknown_args = self._parser.parse_known_and_unknown_args(args)
         mode = getattr(ns, "assertmode", "plain")
 
         disable_autoload = getattr(ns, "disable_plugin_autoload", False) or bool(
@@ -1630,7 +1630,7 @@ def _getini_unknown_type(self, name: str, type: str, value: object):
 
     def _getini(self, name: str):
         try:
-            description, type, default = self._parser._inidict[name]
+            _description, type, default = self._parser._inidict[name]
         except KeyError as e:
             raise ValueError(f"unknown configuration value: {name!r}") from e
         override_value = self._get_override_ini_value(name)

src/_pytest/helpconfig.py

@@ -185,7 +185,7 @@ def showhelp(config: Config) -> None:
     indent_len = 24  # based on argparse's max_help_position=24
     indent = " " * indent_len
     for name in config._parser._ininames:
-        help, type, default = config._parser._inidict[name]
+        help, type, _default = config._parser._inidict[name]
         if type is None:
             type = "string"
         if help is None:

src/_pytest/mark/structures.py

@@ -60,7 +60,7 @@ def get_empty_parameterset_mark(
 
     argslisting = ", ".join(argnames)
 
-    fs, lineno = getfslineno(func)
+    _fs, lineno = getfslineno(func)
     reason = f"got empty parameter set for ({argslisting})"
     requested_mark = config.getini(EMPTY_PARAMETERSET_OPTION)
     if requested_mark in ("", None, "skip"):

src/_pytest/raises.py

@@ -452,7 +452,7 @@ def _parse_exc(
                 issubclass(origin_exc, BaseExceptionGroup)
                 and exc_type in (BaseException, Any)
             ):
-                if not isinstance(exc, Exception):
+                if not issubclass(origin_exc, ExceptionGroup):
                     self.is_baseexception = True
                 return cast(type[BaseExcT_1], origin_exc)
             else:
@@ -465,9 +465,9 @@ def _parse_exc(
                 )
         # unclear if the Type/ValueError distinction is even helpful here
         msg = f"expected exception must be {expected}, not "
-        if isinstance(exc, type):
+        if isinstance(exc, type):  # type: ignore[unreachable]
             raise ValueError(msg + f"{exc.__name__!r}")
-        if isinstance(exc, BaseException):
+        if isinstance(exc, BaseException):  # type: ignore[unreachable]
             raise TypeError(msg + f"an exception instance ({type(exc).__name__})")
         raise TypeError(msg + repr(type(exc).__name__))
 

src/_pytest/reports.py

@@ -194,7 +194,7 @@ def head_line(self) -> str | None:
             even in patch releases.
         """
         if self.location is not None:
-            fspath, lineno, domain = self.location
+            _fspath, _lineno, domain = self.location
             return domain
         return None