Remove a type: ignore - Type gethookproxy/ihook as HookRelay | FSHookProxy

changelog/14728.misc.rst

@@ -0,0 +1 @@
+Improved the type annotations of ``Node.ihook`` and ``Session.gethookproxy``.

doc/en/conf.py

@@ -80,6 +80,7 @@
     ("py:class", "_pytest.logging.LogCaptureHandler"),
     ("py:class", "_pytest.mark.structures.ParameterSet"),
     # Intentionally undocumented/private
+    ("py:class", "FSHookProxy"),
     ("py:class", "_pytest._code.code.Traceback"),
     ("py:class", "_pytest._py.path.LocalPath"),
     ("py:class", "_pytest.capture.CaptureResult"),

src/_pytest/main.py

@@ -728,18 +728,18 @@ def isinitpath(
         else:
             return path_ in self._initialpaths
 
-    def gethookproxy(self, fspath: os.PathLike[str]) -> pluggy.HookRelay:
+    def gethookproxy(self, fspath: os.PathLike[str]) -> pluggy.HookRelay | FSHookProxy:
         # Optimization: Path(Path(...)) is much slower than isinstance.
         path = fspath if isinstance(fspath, Path) else Path(fspath)
         pm = self.config.pluginmanager
         # Check if we have the common case of running
         # hooks with all conftest.py files.
         my_conftestmodules = pm._getconftestmodules(path)
         remove_mods = pm._conftest_plugins.difference(my_conftestmodules)
-        proxy: pluggy.HookRelay
+        proxy: pluggy.HookRelay | FSHookProxy
         if remove_mods:
             # One or more conftests are not in use at this path.
-            proxy = FSHookProxy(pm, remove_mods)  # type: ignore[assignment]
+            proxy = FSHookProxy(pm, remove_mods)
         else:
             # All plugins are active for this fspath.
             proxy = self.config.hook

src/_pytest/nodes.py

@@ -44,6 +44,7 @@
     from typing_extensions import Self
 
     # Imported here due to circular import.
+    from _pytest.main import FSHookProxy
     from _pytest.main import Session
 
 
@@ -225,7 +226,7 @@ def from_parent(cls, parent: Node, **kw) -> Self:
         return cls._create(parent=parent, **kw)
 
     @property
-    def ihook(self) -> pluggy.HookRelay:
+    def ihook(self) -> pluggy.HookRelay | FSHookProxy:
         """Path-sensitive hook proxy used to call pytest hooks."""
         return self.session.gethookproxy(self.path)