Merge pull request #13082 from pytest-dev/pre-commit-ci-update-config

Pierre-Sassoulas · web-flow · commit 62c0819b915d · 2025-01-11T08:39:49.000+01:00
[pre-commit.ci] pre-commit autoupdate
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.8.3"
+  rev: "v0.9.0"
   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: v0.9.2
+  rev: v1.0.1
   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.13.0
+    rev: v1.14.1
     hooks:
     -   id: mypy
         files: ^(src/|testing/|scripts/)
@@ -54,7 +54,7 @@ repos:
       # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
       additional_dependencies: ["tox>=4.9"]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
     -   id: pyupgrade
         args:
diff --git a/doc/en/example/assertion/failure_demo.py b/doc/en/example/assertion/failure_demo.py
@@ -267,9 +267,9 @@ class A:
             a = 1
 
         b = 2
-        assert (
-            A.a == b
-        ), "A.a appears not to be b\nor does not appear to be b\none of those"
+        assert A.a == b, (
+            "A.a appears not to be b\nor does not appear to be b\none of those"
+        )
 
     def test_custom_repr(self):
         class JSON:
diff --git a/scripts/prepare-release-pr.py b/scripts/prepare-release-pr.py
@@ -163,7 +163,7 @@ def find_next_version(
     last_version = valid_versions[-1]
 
     if is_major:
-        return f"{last_version[0]+1}.0.0{prerelease}"
+        return f"{last_version[0] + 1}.0.0{prerelease}"
     elif is_feature_release:
         return f"{last_version[0]}.{last_version[1] + 1}.0{prerelease}"
     else:
diff --git a/scripts/update-plugin-list.py b/scripts/update-plugin-list.py
@@ -176,7 +176,7 @@ def version_sort_key(version_string: str) -> Any:
                 )
                 last_release = release_date.strftime("%b %d, %Y")
                 break
-        name = f':pypi:`{info["name"]}`'
+        name = f":pypi:`{info['name']}`"
         summary = ""
         if info["summary"]:
             summary = escape_rst(info["summary"].replace("\n", ""))
@@ -194,7 +194,7 @@ def plugin_definitions(plugins: Iterable[PluginInfo]) -> Iterator[str]:
     for plugin in plugins:
         yield dedent(
             f"""
-            {plugin['name']}
+            {plugin["name"]}
                *last release*: {plugin["last_release"]},
                *status*: {plugin["status"]},
                *requires*: {plugin["requires"]}
diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
@@ -217,7 +217,7 @@ def relline(self) -> int:
         return self.lineno - self.frame.code.firstlineno
 
     def __repr__(self) -> str:
-        return f"<TracebackEntry {self.frame.code.path}:{self.lineno+1}>"
+        return f"<TracebackEntry {self.frame.code.path}:{self.lineno + 1}>"
 
     @property
     def statement(self) -> Source:
@@ -303,7 +303,7 @@ def __str__(self) -> str:
         # This output does not quite match Python's repr for traceback entries,
         # but changing it to do so would break certain plugins.  See
         # https://github.com/pytest-dev/pytest/pull/7535/ for details.
-        return f"  File '{self.path}':{self.lineno+1} in {name}\n  {line}\n"
+        return f"  File '{self.path}':{self.lineno + 1} in {name}\n  {line}\n"
 
     @property
     def name(self) -> str:
@@ -527,33 +527,33 @@ def fill_unfilled(self, exc_info: tuple[type[E], E, TracebackType]) -> None:
     @property
     def type(self) -> type[E]:
         """The exception class."""
-        assert (
-            self._excinfo is not None
-        ), ".type can only be used after the context manager exits"
+        assert self._excinfo is not None, (
+            ".type can only be used after the context manager exits"
+        )
         return self._excinfo[0]
 
     @property
     def value(self) -> E:
         """The exception value."""
-        assert (
-            self._excinfo is not None
-        ), ".value can only be used after the context manager exits"
+        assert self._excinfo is not None, (
+            ".value can only be used after the context manager exits"
+        )
         return self._excinfo[1]
 
     @property
     def tb(self) -> TracebackType:
         """The exception raw traceback."""
-        assert (
-            self._excinfo is not None
-        ), ".tb can only be used after the context manager exits"
+        assert self._excinfo is not None, (
+            ".tb can only be used after the context manager exits"
+        )
         return self._excinfo[2]
 
     @property
     def typename(self) -> str:
         """The type name of the exception."""
-        assert (
-            self._excinfo is not None
-        ), ".typename can only be used after the context manager exits"
+        assert self._excinfo is not None, (
+            ".typename can only be used after the context manager exits"
+        )
         return self.type.__name__
 
     @property
diff --git a/src/_pytest/_py/error.py b/src/_pytest/_py/error.py
@@ -90,15 +90,21 @@ def checked_call(
         except OSError as value:
             if not hasattr(value, "errno"):
                 raise
-            errno = value.errno
             if sys.platform == "win32":
                 try:
-                    cls = self._geterrnoclass(_winerrnomap[errno])
+                    cls = self._geterrnoclass(_winerrnomap[value.errno])
                 except KeyError:
                     raise value
             else:
                 # we are not on Windows, or we got a proper OSError
-                cls = self._geterrnoclass(errno)
+                if value.errno is None:
+                    cls = type(
+                        "UnknownErrnoNone",
+                        (Error,),
+                        {"__module__": "py.error", "__doc__": None},
+                    )
+                else:
+                    cls = self._geterrnoclass(value.errno)
 
             raise cls(f"{func.__name__}{args!r}")
 
diff --git a/src/_pytest/cacheprovider.py b/src/_pytest/cacheprovider.py
@@ -482,8 +482,7 @@ def pytest_addoption(parser: Parser) -> None:
         "--last-failed",
         action="store_true",
         dest="lf",
-        help="Rerun only the tests that failed "
-        "at the last run (or all if none failed)",
+        help="Rerun only the tests that failed at the last run (or all if none failed)",
     )
     group.addoption(
         "--ff",
diff --git a/src/_pytest/capture.py b/src/_pytest/capture.py
@@ -375,10 +375,10 @@ def __repr__(self) -> str:
         )
 
     def _assert_state(self, op: str, states: tuple[str, ...]) -> None:
-        assert (
-            self._state in states
-        ), "cannot {} in state {!r}: expected one of {}".format(
-            op, self._state, ", ".join(states)
+        assert self._state in states, (
+            "cannot {} in state {!r}: expected one of {}".format(
+                op, self._state, ", ".join(states)
+            )
         )
 
     def start(self) -> None:
@@ -492,10 +492,10 @@ def __repr__(self) -> str:
         )
 
     def _assert_state(self, op: str, states: tuple[str, ...]) -> None:
-        assert (
-            self._state in states
-        ), "cannot {} in state {!r}: expected one of {}".format(
-            op, self._state, ", ".join(states)
+        assert self._state in states, (
+            "cannot {} in state {!r}: expected one of {}".format(
+                op, self._state, ", ".join(states)
+            )
         )
 
     def start(self) -> None:
diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py
@@ -70,8 +70,8 @@ def getlocation(function, curdir: str | os.PathLike[str] | None = None) -> str:
         except ValueError:
             pass
         else:
-            return f"{relfn}:{lineno+1}"
-    return f"{fn}:{lineno+1}"
+            return f"{relfn}:{lineno + 1}"
+    return f"{fn}:{lineno + 1}"
 
 
 def num_mock_patch_args(function) -> int:
diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
@@ -838,9 +838,9 @@ def import_plugin(self, modname: str, consider_entry_points: bool = False) -> No
         # "terminal" or "capture".  Those plugins are registered under their
         # basename for historic purposes but must be imported with the
         # _pytest prefix.
-        assert isinstance(
-            modname, str
-        ), f"module name as text required, got {modname!r}"
+        assert isinstance(modname, str), (
+            f"module name as text required, got {modname!r}"
+        )
         if self.is_blocked(modname) or self.get_plugin(modname) is not None:
             return
 
@@ -1503,9 +1503,9 @@ def _get_unknown_ini_keys(self) -> list[str]:
 
     def parse(self, args: list[str], addopts: bool = True) -> None:
         # Parse given cmdline arguments into this config object.
-        assert (
-            self.args == []
-        ), "can only parse cmdline args at most once per Config object"
+        assert self.args == [], (
+            "can only parse cmdline args at most once per Config object"
+        )
         self.hook.pytest_addhooks.call_historic(
             kwargs=dict(pluginmanager=self.pluginmanager)
         )
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
@@ -746,7 +746,9 @@ def node(self):
         if node is None and scope is Scope.Class:
             # Fallback to function item itself.
             node = self._pyfuncitem
-        assert node, f'Could not obtain a node for scope "{scope}" for function {self._pyfuncitem!r}'
+        assert node, (
+            f'Could not obtain a node for scope "{scope}" for function {self._pyfuncitem!r}'
+        )
         return node
 
     def _check_scope(
@@ -808,9 +810,9 @@ def formatrepr(self) -> FixtureLookupErrorRepr:
         # new cases it might break.
         # Add the assert to make it clearer to developer that this will fail, otherwise
         # it crashes because `fspath` does not get set due to `stack` being empty.
-        assert (
-            self.msg is None or self.fixturestack
-        ), "formatrepr assumptions broken, rewrite it to handle it"
+        assert self.msg is None or self.fixturestack, (
+            "formatrepr assumptions broken, rewrite it to handle it"
+        )
         if msg is not None:
             # The last fixture raise an error, let's present
             # it at the requesting side.
diff --git a/src/_pytest/pathlib.py b/src/_pytest/pathlib.py
@@ -711,7 +711,7 @@ def _import_module_using_spec(
         if module_path.is_dir():
             # The `spec_from_file_location` matches a loader based on the file extension by default.
             # For a namespace package, need to manually specify a loader.
-            loader = NamespaceLoader(name, module_path, PathFinder())
+            loader = NamespaceLoader(name, module_path, PathFinder())  # type: ignore[arg-type]
 
         spec = importlib.util.spec_from_file_location(
             module_name, str(module_path), loader=loader
diff --git a/src/_pytest/python.py b/src/_pytest/python.py
@@ -914,9 +914,9 @@ def make_unique_parameterset_ids(self) -> list[str]:
                         new_id = f"{id}{suffix}{id_suffixes[id]}"
                     resolved_ids[index] = new_id
                     id_suffixes[id] += 1
-        assert len(resolved_ids) == len(
-            set(resolved_ids)
-        ), f"Internal error: {resolved_ids=}"
+        assert len(resolved_ids) == len(set(resolved_ids)), (
+            f"Internal error: {resolved_ids=}"
+        )
         return resolved_ids
 
     def _resolve_ids(self) -> Iterable[str]:
diff --git a/src/_pytest/python_api.py b/src/_pytest/python_api.py
@@ -241,7 +241,7 @@ class ApproxMapping(ApproxBase):
     with numeric values (the keys can be anything)."""
 
     def __repr__(self) -> str:
-        return f"approx({({k: self._approx_scalar(v) for k, v in self.expected.items()})!r})"
+        return f"approx({ ({k: self._approx_scalar(v) for k, v in self.expected.items()})!r})"
 
     def _repr_compare(self, other_side: Mapping[object, float]) -> list[str]:
         import math
@@ -867,7 +867,8 @@ def raises(
 
        Given that ``pytest.raises`` matches subclasses, be wary of using it to match :class:`Exception` like this::
 
-           with pytest.raises(Exception):  # Careful, this will catch ANY exception raised.
+           # Careful, this will catch ANY exception raised.
+           with pytest.raises(Exception):
                some_function()
 
        Because :class:`Exception` is the base class of almost all exceptions, it is easy for this to hide
diff --git a/src/_pytest/reports.py b/src/_pytest/reports.py
@@ -361,9 +361,9 @@ def from_item_and_call(cls, item: Item, call: CallInfo[None]) -> TestReport:
             elif isinstance(excinfo.value, skip.Exception):
                 outcome = "skipped"
                 r = excinfo._getreprcrash()
-                assert (
-                    r is not None
-                ), "There should always be a traceback entry for skipping a test."
+                assert r is not None, (
+                    "There should always be a traceback entry for skipping a test."
+                )
                 if excinfo.value._use_item_location:
                     path, line = item.reportinfo()[:2]
                     assert line is not None
diff --git a/src/_pytest/scope.py b/src/_pytest/scope.py
@@ -33,11 +33,11 @@ class Scope(Enum):
     """
 
     # Scopes need to be listed from lower to higher.
-    Function: _ScopeName = "function"
-    Class: _ScopeName = "class"
-    Module: _ScopeName = "module"
-    Package: _ScopeName = "package"
-    Session: _ScopeName = "session"
+    Function = "function"
+    Class = "class"
+    Module = "module"
+    Package = "package"
+    Session = "session"
 
     def next_lower(self) -> Scope:
         """Return the next lower scope."""
diff --git a/testing/_py/test_local.py b/testing/_py/test_local.py
@@ -18,7 +18,7 @@
 @contextlib.contextmanager
 def ignore_encoding_warning():
     with warnings.catch_warnings():
-        if sys.version_info > (3, 10):
+        if sys.version_info >= (3, 10):
             warnings.simplefilter("ignore", EncodingWarning)  # noqa: F821
         yield
 
@@ -555,9 +555,9 @@ def batch_make_numbered_dirs(rootdir, repeats):
         file_ = dir_.join("foo")
         file_.write_text(f"{i}", encoding="utf-8")
         actual = int(file_.read_text(encoding="utf-8"))
-        assert (
-            actual == i
-        ), f"int(file_.read_text(encoding='utf-8')) is {actual} instead of {i}"
+        assert actual == i, (
+            f"int(file_.read_text(encoding='utf-8')) is {actual} instead of {i}"
+        )
         dir_.join(".lock").remove(ignore_errors=True)
     return True
 
diff --git a/testing/io/test_terminalwriter.py b/testing/io/test_terminalwriter.py
@@ -3,6 +3,7 @@
 
 from collections.abc import Generator
 import io
+from io import StringIO
 import os
 from pathlib import Path
 import re
@@ -68,6 +69,7 @@ def test_terminalwriter_not_unicode() -> None:
 class TestTerminalWriter:
     @pytest.fixture(params=["path", "stringio"])
     def tw(self, request, tmp_path: Path) -> Generator[terminalwriter.TerminalWriter]:
+        f: io.TextIOWrapper | StringIO
         if request.param == "path":
             p = tmp_path.joinpath("tmpfile")
             f = open(str(p), "w+", encoding="utf8")
diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py
diff --git a/testing/test_terminal.py b/testing/test_terminal.py
