Revert FixtureDef to a single argument

Author: nicoddemus

Diff for: src/_pytest/fixtures.py

@@ -131,7 +131,7 @@ def pytest_sessionstart(session: Session) -> None:
 
 def get_scope_package(
     node: nodes.Item,
-    fixturedef: FixtureDef[Any, object],
+    fixturedef: FixtureDef[object],
 ) -> nodes.Node | None:
     from _pytest.python import Package
 
@@ -328,7 +328,7 @@ class FuncFixtureInfo:
     # matching the name which are applicable to this function.
     # There may be multiple overriding fixtures with the same name. The
     # sequence is ordered from furthest to closes to the function.
-    name2fixturedefs: dict[str, Sequence[FixtureDef[Any, Any]]]
+    name2fixturedefs: dict[str, Sequence[FixtureDef[Any]]]
 
     def prune_dependency_tree(self) -> None:
         """Recompute names_closure from initialnames and name2fixturedefs.
@@ -369,8 +369,8 @@ def __init__(
         self,
         pyfuncitem: Function,
         fixturename: str | None,
-        arg2fixturedefs: dict[str, Sequence[FixtureDef[Any, Any]]],
-        fixture_defs: dict[str, FixtureDef[Any, Any]],
+        arg2fixturedefs: dict[str, Sequence[FixtureDef[Any]]],
+        fixture_defs: dict[str, FixtureDef[Any]],
         *,
         _ispytest: bool = False,
     ) -> None:
@@ -413,7 +413,7 @@ def scope(self) -> _ScopeName:
     @abc.abstractmethod
     def _check_scope(
         self,
-        requested_fixturedef: FixtureDef[Any, object] | PseudoFixtureDef[object],
+        requested_fixturedef: FixtureDef[object] | PseudoFixtureDef[object],
         requested_scope: Scope,
     ) -> None:
         raise NotImplementedError()
@@ -554,7 +554,7 @@ def _iter_chain(self) -> Iterator[SubRequest]:
 
     def _get_active_fixturedef(
         self, argname: str
-    ) -> FixtureDef[Any, object] | PseudoFixtureDef[object]:
+    ) -> FixtureDef[object] | PseudoFixtureDef[object]:
         if argname == "request":
             cached_result = (self, [0], None)
             return PseudoFixtureDef(cached_result, Scope.Function)
@@ -626,9 +626,7 @@ def _get_active_fixturedef(
         self._fixture_defs[argname] = fixturedef
         return fixturedef
 
-    def _check_fixturedef_without_param(
-        self, fixturedef: FixtureDef[Any, object]
-    ) -> None:
+    def _check_fixturedef_without_param(self, fixturedef: FixtureDef[object]) -> None:
         """Check that this request is allowed to execute this fixturedef without
         a param."""
         funcitem = self._pyfuncitem
@@ -661,7 +659,7 @@ def _check_fixturedef_without_param(
             )
             fail(msg, pytrace=False)
 
-    def _get_fixturestack(self) -> list[FixtureDef[Any, Any]]:
+    def _get_fixturestack(self) -> list[FixtureDef[Any]]:
         values = [request._fixturedef for request in self._iter_chain()]
         values.reverse()
         return values
@@ -686,7 +684,7 @@ def _scope(self) -> Scope:
 
     def _check_scope(
         self,
-        requested_fixturedef: FixtureDef[Any, object] | PseudoFixtureDef[object],
+        requested_fixturedef: FixtureDef[object] | PseudoFixtureDef[object],
         requested_scope: Scope,
     ) -> None:
         # TopRequest always has function scope so always valid.
@@ -720,7 +718,7 @@ def __init__(
         scope: Scope,
         param: Any,
         param_index: int,
-        fixturedef: FixtureDef[Any, object],
+        fixturedef: FixtureDef[object],
         *,
         _ispytest: bool = False,
     ) -> None:
@@ -733,7 +731,7 @@ def __init__(
         )
         self._parent_request: Final[FixtureRequest] = request
         self._scope_field: Final = scope
-        self._fixturedef: Final[FixtureDef[Any, object]] = fixturedef
+        self._fixturedef: Final[FixtureDef[object]] = fixturedef
         if param is not NOTSET:
             self.param = param
         self.param_index: Final = param_index
@@ -763,7 +761,7 @@ def node(self):
 
     def _check_scope(
         self,
-        requested_fixturedef: FixtureDef[Any, object] | PseudoFixtureDef[object],
+        requested_fixturedef: FixtureDef[object] | PseudoFixtureDef[object],
         requested_scope: Scope,
     ) -> None:
         if isinstance(requested_fixturedef, PseudoFixtureDef):
@@ -784,7 +782,7 @@ def _check_scope(
                 pytrace=False,
             )
 
-    def _format_fixturedef_line(self, fixturedef: FixtureDef[Any, object]) -> str:
+    def _format_fixturedef_line(self, fixturedef: FixtureDef[object]) -> str:
         factory = fixturedef.func
         path, lineno = getfslineno(factory)
         if isinstance(path, Path):
@@ -959,7 +957,7 @@ def _eval_scope_callable(
 
 
 @final
-class FixtureDef(Generic[FixtureParams, FixtureValue]):
+class FixtureDef(Generic[FixtureValue]):
     """A container for a fixture definition.
 
     This is a generic class parametrized on the parameters that a fixture function receives and its return value.
@@ -973,7 +971,7 @@ def __init__(
         config: Config,
         baseid: str | None,
         argname: str,
-        func: _FixtureFunc[FixtureParams, FixtureValue],
+        func: _FixtureFunc[Any, FixtureValue],
         scope: Scope | _ScopeName | Callable[[str, Config], _ScopeName] | None,
         params: Sequence[object] | None,
         ids: tuple[object | None, ...] | Callable[[Any], object | None] | None = None,
@@ -1128,8 +1126,8 @@ def __repr__(self) -> str:
 
 
 def resolve_fixture_function(
-    fixturedef: FixtureDef[FixtureParams, FixtureValue], request: FixtureRequest
-) -> _FixtureFunc[FixtureParams, FixtureValue]:
+    fixturedef: FixtureDef[FixtureValue], request: FixtureRequest
+) -> _FixtureFunc[Any, FixtureValue]:
     """Get the actual callable that can be called to obtain the fixture
     value."""
     fixturefunc = fixturedef.func
@@ -1152,7 +1150,7 @@ def resolve_fixture_function(
 
 
 def pytest_fixture_setup(
-    fixturedef: FixtureDef[FixtureParams, FixtureValue], request: SubRequest
+    fixturedef: FixtureDef[FixtureValue], request: SubRequest
 ) -> FixtureValue:
     """Execution of fixture setup."""
     kwargs = {}
@@ -1525,7 +1523,7 @@ def __init__(self, session: Session) -> None:
         # suite/plugins defined with this name. Populated by parsefactories().
         # TODO: The order of the FixtureDefs list of each arg is significant,
         #       explain.
-        self._arg2fixturedefs: Final[dict[str, list[FixtureDef[Any, Any]]]] = {}
+        self._arg2fixturedefs: Final[dict[str, list[FixtureDef[Any]]]] = {}
         self._holderobjseen: Final[set[object]] = set()
         # A mapping from a nodeid to a list of autouse fixtures it defines.
         self._nodeid_autousenames: Final[dict[str, list[str]]] = {
@@ -1616,7 +1614,7 @@ def getfixtureclosure(
         parentnode: nodes.Node,
         initialnames: tuple[str, ...],
         ignore_args: AbstractSet[str],
-    ) -> tuple[list[str], dict[str, Sequence[FixtureDef[Any, Any]]]]:
+    ) -> tuple[list[str], dict[str, Sequence[FixtureDef[Any]]]]:
         # Collect the closure of all fixtures, starting with the given
         # fixturenames as the initial set.  As we have to visit all
         # factory definitions anyway, we also return an arg2fixturedefs
@@ -1626,7 +1624,7 @@ def getfixtureclosure(
 
         fixturenames_closure = list(initialnames)
 
-        arg2fixturedefs: dict[str, Sequence[FixtureDef[Any, Any]]] = {}
+        arg2fixturedefs: dict[str, Sequence[FixtureDef[Any]]] = {}
         lastlen = -1
         while lastlen != len(fixturenames_closure):
             lastlen = len(fixturenames_closure)
@@ -1841,7 +1839,7 @@ def parsefactories(
 
     def getfixturedefs(
         self, argname: str, node: nodes.Node
-    ) -> Sequence[FixtureDef[Any, Any]] | None:
+    ) -> Sequence[FixtureDef[Any]] | None:
         """Get FixtureDefs for a fixture name which are applicable
         to a given node.
 
@@ -1860,8 +1858,8 @@ def getfixturedefs(
         return tuple(self._matchfactories(fixturedefs, node))
 
     def _matchfactories(
-        self, fixturedefs: Iterable[FixtureDef[Any, Any]], node: nodes.Node
-    ) -> Iterator[FixtureDef[Any, Any]]:
+        self, fixturedefs: Iterable[FixtureDef[Any]], node: nodes.Node
+    ) -> Iterator[FixtureDef[Any]]:
         parentnodeids = {n.nodeid for n in node.iter_parents()}
         for fixturedef in fixturedefs:
             if fixturedef.baseid in parentnodeids:
@@ -1898,7 +1896,7 @@ def get_best_relpath(func) -> str:
         loc = getlocation(func, invocation_dir)
         return bestrelpath(invocation_dir, Path(loc))
 
-    def write_fixture(fixture_def: FixtureDef[Any, object]) -> None:
+    def write_fixture(fixture_def: FixtureDef[object]) -> None:
         argname = fixture_def.argname
         if verbose <= 0 and argname.startswith("_"):
             return

Diff for: src/_pytest/hookspec.py

@@ -866,7 +866,7 @@ def pytest_report_from_serializable(
 
 @hookspec(firstresult=True)
 def pytest_fixture_setup(
-    fixturedef: FixtureDef[Any, Any], request: SubRequest
+    fixturedef: FixtureDef[Any], request: SubRequest
 ) -> object | None:
     """Perform fixture setup execution.
 
@@ -894,7 +894,7 @@ def pytest_fixture_setup(
 
 
 def pytest_fixture_post_finalizer(
-    fixturedef: FixtureDef[Any, Any], request: SubRequest
+    fixturedef: FixtureDef[Any], request: SubRequest
 ) -> None:
     """Called after fixture teardown, but before the cache is cleared, so
     the fixture result ``fixturedef.cached_result`` is still available (not

Diff for: src/_pytest/python.py

@@ -1085,7 +1085,7 @@ def get_direct_param_fixture_func(request: FixtureRequest) -> Any:
 
 
 # Used for storing pseudo fixturedefs for direct parametrization.
-name2pseudofixturedef_key = StashKey[dict[str, FixtureDef[Any, Any]]]()
+name2pseudofixturedef_key = StashKey[dict[str, FixtureDef[Any]]]()
 
 
 @final
@@ -1271,7 +1271,7 @@ def parametrize(
         if node is None:
             name2pseudofixturedef = None
         else:
-            default: dict[str, FixtureDef[Any, Any]] = {}
+            default: dict[str, FixtureDef[Any]] = {}
             name2pseudofixturedef = node.stash.setdefault(
                 name2pseudofixturedef_key, default
             )
@@ -1458,7 +1458,7 @@ def _recompute_direct_params_indices(self) -> None:
 
 def _find_parametrized_scope(
     argnames: Sequence[str],
-    arg2fixturedefs: Mapping[str, Sequence[fixtures.FixtureDef[Any, object]]],
+    arg2fixturedefs: Mapping[str, Sequence[fixtures.FixtureDef[object]]],
     indirect: bool | Sequence[str],
 ) -> Scope:
     """Find the most appropriate scope for a parametrized call based on its arguments.

Diff for: src/_pytest/setuponly.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from collections.abc import Generator
-from typing import Any
 
 from _pytest._io.saferepr import saferepr
 from _pytest.config import Config
@@ -31,7 +30,7 @@ def pytest_addoption(parser: Parser) -> None:
 
 @pytest.hookimpl(wrapper=True)
 def pytest_fixture_setup(
-    fixturedef: FixtureDef[Any, object], request: SubRequest
+    fixturedef: FixtureDef[object], request: SubRequest
 ) -> Generator[None, object, object]:
     try:
         return (yield)
@@ -52,7 +51,7 @@ def pytest_fixture_setup(
 
 
 def pytest_fixture_post_finalizer(
-    fixturedef: FixtureDef[Any, object], request: SubRequest
+    fixturedef: FixtureDef[object], request: SubRequest
 ) -> None:
     if fixturedef.cached_result is not None:
         config = request.config
@@ -63,7 +62,7 @@ def pytest_fixture_post_finalizer(
 
 
 def _show_fixture_action(
-    fixturedef: FixtureDef[Any, object], config: Config, msg: str
+    fixturedef: FixtureDef[object], config: Config, msg: str
 ) -> None:
     capman = config.pluginmanager.getplugin("capturemanager")
     if capman:

Diff for: src/_pytest/setupplan.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Any
-
 from _pytest.config import Config
 from _pytest.config import ExitCode
 from _pytest.config.argparsing import Parser
@@ -23,7 +21,7 @@ def pytest_addoption(parser: Parser) -> None:
 
 @pytest.hookimpl(tryfirst=True)
 def pytest_fixture_setup(
-    fixturedef: FixtureDef[Any, object], request: SubRequest
+    fixturedef: FixtureDef[object], request: SubRequest
 ) -> object | None:
     # Will return a dummy fixture if the setuponly option is provided.
     if request.config.option.setupplan:

Diff for: testing/python/metafunc.py

@@ -32,7 +32,7 @@ def Metafunc(self, func, config=None) -> python.Metafunc:
         # on the funcarg level, so we don't need a full blown
         # initialization.
         class FuncFixtureInfoMock:
-            name2fixturedefs: dict[str, list[fixtures.FixtureDef[Any, object]]] = {}
+            name2fixturedefs: dict[str, list[fixtures.FixtureDef[object]]] = {}
 
             def __init__(self, names):
                 self.names_closure = names
@@ -153,7 +153,7 @@ class DummyFixtureDef:
             _scope: Scope
 
         fixtures_defs = cast(
-            dict[str, Sequence[fixtures.FixtureDef[Any, object]]],
+            dict[str, Sequence[fixtures.FixtureDef[object]]],
             dict(
                 session_fix=[DummyFixtureDef(Scope.Session)],
                 package_fix=[DummyFixtureDef(Scope.Package)],