[pre-commit.ci] pre-commit autoupdate (#13475)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.11.11 → v0.11.12](astral-sh/ruff-pre-commit@v0.11.11...v0.11.12)
- [github.com/woodruffw/zizmor-pre-commit: v1.8.0 → v1.9.0](zizmorcore/zizmor-pre-commit@v1.8.0...v1.9.0)
- [github.com/pre-commit/mirrors-mypy: v1.15.0 → v1.16.0](pre-commit/mirrors-mypy@v1.15.0...v1.16.0)

* Fix new mypy errors

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ran Benita <[email protected]>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.11.11"
+  rev: "v0.11.12"
   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.8.0
+  rev: v1.9.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.15.0
+    rev: v1.16.0
     hooks:
     -   id: mypy
         files: ^(src/|testing/|scripts/)

src/_pytest/assertion/rewrite.py

@@ -702,7 +702,6 @@ def run(self, mod: ast.Module) -> None:
         if doc is not None and self.is_rewrite_disabled(doc):
             return
         pos = 0
-        item = None
         for item in mod.body:
             if (
                 expect_docstring

src/_pytest/config/__init__.py

@@ -284,7 +284,7 @@ def get_config(
     args: list[str] | None = None,
     plugins: Sequence[str | _PluggyPlugin] | None = None,
 ) -> Config:
-    # subsequent calls to main will create a fresh instance
+    # Subsequent calls to main will create a fresh instance.
     pluginmanager = PytestPluginManager()
     config = Config(
         pluginmanager,
@@ -330,21 +330,21 @@ def _prepareconfig(
         )
         raise TypeError(msg.format(args, type(args)))
 
-    config = get_config(args, plugins)
-    pluginmanager = config.pluginmanager
+    initial_config = get_config(args, plugins)
+    pluginmanager = initial_config.pluginmanager
     try:
         if plugins:
             for plugin in plugins:
                 if isinstance(plugin, str):
                     pluginmanager.consider_pluginarg(plugin)
                 else:
                     pluginmanager.register(plugin)
-        config = pluginmanager.hook.pytest_cmdline_parse(
+        config: Config = pluginmanager.hook.pytest_cmdline_parse(
             pluginmanager=pluginmanager, args=args
         )
         return config
     except BaseException:
-        config._ensure_unconfigure()
+        initial_config._ensure_unconfigure()
         raise
 
 

src/_pytest/fixtures.py

@@ -1106,8 +1106,7 @@ def execute(self, request: SubRequest) -> FixtureValue:
                     exc, exc_tb = self.cached_result[2]
                     raise exc.with_traceback(exc_tb)
                 else:
-                    result = self.cached_result[0]
-                    return result
+                    return self.cached_result[0]
             # We have a previous but differently parametrized fixture instance
             # so we need to tear it down before creating a new one.
             self.finish(request)
@@ -1123,10 +1122,12 @@ def execute(self, request: SubRequest) -> FixtureValue:
         ihook = request.node.ihook
         try:
             # Setup the fixture, run the code in it, and cache the value
-            # in self.cached_result
-            result = ihook.pytest_fixture_setup(fixturedef=self, request=request)
+            # in self.cached_result.
+            result: FixtureValue = ihook.pytest_fixture_setup(
+                fixturedef=self, request=request
+            )
         finally:
-            # schedule our finalizer, even if the setup failed
+            # Schedule our finalizer, even if the setup failed.
             request.node.addfinalizer(finalizer)
 
         return result

src/_pytest/python_api.py

@@ -474,8 +474,7 @@ def is_bool(val: Any) -> bool:
         result: bool = abs(self.expected - actual) <= self.tolerance
         return result
 
-    # Ignore type because of https://github.com/python/mypy/issues/4266.
-    __hash__ = None  # type: ignore
+    __hash__ = None
 
     @property
     def tolerance(self):

src/_pytest/recwarn.py

@@ -167,7 +167,7 @@ def warns(
             return func(*args[1:], **kwargs)
 
 
-class WarningsRecorder(warnings.catch_warnings):  # type:ignore[type-arg]
+class WarningsRecorder(warnings.catch_warnings):
     """A context manager to record raised warnings.
 
     Each recorded warning is an instance of :class:`warnings.WarningMessage`.
@@ -226,7 +226,9 @@ def clear(self) -> None:
         """Clear the list of recorded warnings."""
         self._list[:] = []
 
-    def __enter__(self) -> Self:
+    # Type ignored because we basically want the `catch_warnings` generic type
+    # parameter to be ourselves but that is not possible(?).
+    def __enter__(self) -> Self:  # type: ignore[override]
         if self._entered:
             __tracebackhide__ = True
             raise RuntimeError(f"Cannot enter {self!r} twice")

testing/test_collection.py

@@ -1615,7 +1615,7 @@ def __init__(self, name, parent, x):
             self.x = x
 
         @classmethod
-        def from_parent(cls, parent, *, name, x):
+        def from_parent(cls, parent, *, name, x):  # type: ignore[override]
             return super().from_parent(parent=parent, name=name, x=x)
 
     collector = MyCollector.from_parent(parent=request.session, name="foo", x=10)

testing/test_junitxml.py

@@ -76,11 +76,11 @@ def nodeval(node: minidom.Element, name: str) -> str | None:
 
 
 class DomDocument:
-    def __init__(self, dom: minidom.Document):
-        self._node = dom
-
     _node: minidom.Document | minidom.Element
 
+    def __init__(self, dom: minidom.Document) -> None:
+        self._node = dom
+
     def find_first_by_tag(self, tag: str) -> DomNode | None:
         return self.find_nth_by_tag(tag, 0)
 
@@ -105,7 +105,9 @@ def find_by_tag(self, tag: str) -> list[DomNode]:
 
     @property
     def children(self) -> list[DomNode]:
-        return [DomNode(x) for x in self._node.childNodes]
+        return [
+            DomNode(x) for x in self._node.childNodes if isinstance(x, minidom.Element)
+        ]
 
     @property
     def get_unique_child(self) -> DomNode:
@@ -120,7 +122,7 @@ def toxml(self) -> str:
 class DomNode(DomDocument):
     _node: minidom.Element
 
-    def __init__(self, dom: minidom.Element):
+    def __init__(self, dom: minidom.Element) -> None:
         self._node = dom
 
     def __repr__(self) -> str:
@@ -129,7 +131,7 @@ def __repr__(self) -> str:
     def __getitem__(self, key: str) -> str:
         node = self._node.getAttributeNode(key)
         if node is not None:
-            return cast(str, node.value)
+            return node.value
         else:
             raise KeyError(key)
 
@@ -139,7 +141,9 @@ def assert_attr(self, **kwargs: object) -> None:
 
     @property
     def text(self) -> str:
-        return cast(str, self._node.childNodes[0].wholeText)
+        text = self._node.childNodes[0]
+        assert isinstance(text, minidom.Text)
+        return text.wholeText
 
     @property
     def tag(self) -> str: