Skip to content

Commit 0499ac4

Browse files
authored
Merge pull request #181 from pytest-dev/fix-mypy
Fix mypy
2 parents ae5c0c0 + d3ff8e8 commit 0499ac4

File tree

5 files changed

+63
-57
lines changed

5 files changed

+63
-57
lines changed

poetry.lock

Lines changed: 57 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pytest = ">=5.0.0"
3838
typing_extensions = "*"
3939

4040
[tool.poetry.group.dev.dependencies]
41-
mypy = "^0.982"
41+
mypy = "^0.991"
4242
tox = "^3.27.0"
4343
packaging = "^21.3"
4444
importlib-metadata = { version = "^5.0.0", python = "<3.8" }

pytest_factoryboy/plugin.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def get_current_deps(self, request: FixtureRequest | SubRequest) -> set[str]:
6060
while hasattr(request, "_parent_request"):
6161
if request.fixturename and request.fixturename not in getattr(request, "_fixturedefs", {}):
6262
deps.add(request.fixturename)
63-
request = request._parent_request # type: ignore[union-attr]
63+
request = request._parent_request
6464
return deps
6565

6666
def execute(self, request: SubRequest, function: DeferredFunction, deferred: list[DeferredFunction]) -> None:
@@ -110,7 +110,9 @@ def factoryboy_request() -> Request:
110110
return Request()
111111

112112

113-
@pytest.hookimpl(tryfirst=True)
113+
# type ignored because pluggy v1.0.0 has no type annotations:
114+
# https://github.com/pytest-dev/pluggy/issues/191
115+
@pytest.hookimpl(tryfirst=True) # type: ignore[misc]
114116
def pytest_runtest_call(item: Item) -> None:
115117
"""Before the test item is called."""
116118
# TODO: We should instead do an `if isinstance(item, Function)`.

requirements-testing.txt

Whitespace-only changes.

tox.ini

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,15 @@ deps =
2525

2626
coverage[toml]
2727

28-
-r{toxinidir}/requirements-testing.txt
29-
3028
[testenv:py312-pytestlatest]
3129
# allow failures of tests run with unstable python 3.12
3230
ignore_outcome = true
3331

3432
[testenv:mypy]
3533
commands = mypy {posargs:.}
3634
deps =
37-
mypy~=0.982
35+
mypy~=0.991
3836

39-
-r{toxinidir}/requirements-testing.txt
4037

4138
[pytest]
4239
addopts = -vv -l

0 commit comments

Comments
 (0)