Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix FixtureFunction TypeAlias and TypeVars #1045

Merged
merged 4 commits into from
Jan 21, 2025
Merged

Fix FixtureFunction TypeAlias and TypeVars #1045

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
620bda7
Fix FixtureFunction TypeAlias and TypeVars
cdce8p Jan 18, 2025
1443d42
Fix __package_loop_stack
cdce8p Jan 18, 2025
9453050
Simplify and improve typing even further
cdce8p Jan 21, 2025
9a74294
Add changelog entries
cdce8p Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions pytest_asyncio/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,18 @@
_ScopeName = Literal["session", "package", "module", "class", "function"]
_T = TypeVar("_T")

SimpleFixtureFunction = TypeVar(
"SimpleFixtureFunction", bound=Callable[..., Awaitable[object]]
FixtureFunctionT = TypeVar(
"FixtureFunctionT",
bound=Union[Callable[..., Awaitable[Any]], Callable[..., AsyncIterator[Any]]],
)
FactoryFixtureFunction = TypeVar(
"FactoryFixtureFunction", bound=Callable[..., AsyncIterator[object]]
FixtureFunctionU = TypeVar(
"FixtureFunctionU",
bound=Union[Callable[..., Awaitable[Any]], Callable[..., AsyncIterator[Any]]],
)
FixtureFunction = Union[SimpleFixtureFunction, FactoryFixtureFunction]
FixtureFunctionMarker = Callable[[FixtureFunction], FixtureFunction]
FixtureFunctionType = Union[
Callable[..., Awaitable[Any]], Callable[..., AsyncIterator[Any]]
]
FixtureFunctionMarker = Callable[[FixtureFunctionT], FixtureFunctionT]


class PytestAsyncioError(Exception):
Expand Down Expand Up @@ -117,7 +121,7 @@ def pytest_addoption(parser: Parser, pluginmanager: PytestPluginManager) -> None

@overload
def fixture(
fixture_function: FixtureFunction,
fixture_function: FixtureFunctionT,
*,
scope: _ScopeName | Callable[[str, Config], _ScopeName] = ...,
loop_scope: _ScopeName | None = ...,
Expand All @@ -129,7 +133,7 @@ def fixture(
| None
) = ...,
name: str | None = ...,
) -> FixtureFunction: ...
) -> FixtureFunctionT: ...


@overload
Expand All @@ -146,22 +150,22 @@ def fixture(
| None
) = ...,
name: str | None = None,
) -> FixtureFunctionMarker: ...
) -> FixtureFunctionMarker[FixtureFunctionU]: ...


def fixture(
fixture_function: FixtureFunction | None = None,
fixture_function: FixtureFunctionT | None = None,
loop_scope: _ScopeName | None = None,
**kwargs: Any,
) -> FixtureFunction | FixtureFunctionMarker:
) -> FixtureFunctionT | FixtureFunctionMarker[FixtureFunctionU]:
if fixture_function is not None:
_make_asyncio_fixture_function(fixture_function, loop_scope)
return pytest.fixture(fixture_function, **kwargs)

else:

@functools.wraps(fixture)
def inner(fixture_function: FixtureFunction) -> FixtureFunction:
def inner(fixture_function: FixtureFunctionU) -> FixtureFunctionU:
return fixture(fixture_function, loop_scope=loop_scope, **kwargs)

return inner
Expand Down Expand Up @@ -679,7 +683,7 @@ def pytest_pycollect_makeitem_convert_async_functions_to_subclass(

# A stack used to push package-scoped loops during collection of a package
# and pop those loops during collection of a Module
__package_loop_stack: list[FixtureFunctionMarker | FixtureFunction] = []
__package_loop_stack: list[Callable[..., Any]] = []


@pytest.hookimpl
Expand Down
Loading