diff --git a/tests/test_pytest_mypy.py b/tests/test_pytest_mypy.py index bd86899..c18e5c4 100644 --- a/tests/test_pytest_mypy.py +++ b/tests/test_pytest_mypy.py @@ -83,6 +83,9 @@ def test_mypy_encoding_warnings(testdir, monkeypatch): # Use typing.TypedDict or typing_extensions.TypedDict instead. # https://github.com/python/mypy/pull/15494 expected_warnings += 1 + elif MYPY_VERSION >= Version("2.4"): + # https://github.com/python/mypy/pull/21823 + expected_warnings -= 1 result.assert_outcomes(passed=mypy_checks, warnings=expected_warnings) diff --git a/tox.ini b/tox.ini index e264d78..1756f61 100644 --- a/tox.ini +++ b/tox.ini @@ -7,17 +7,17 @@ envlist = py311-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} py312-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} py313-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} - py314-pytest{9.0, 9.x}-mypy{2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} + py314-pytest{ 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{ 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} static publish [gh-actions] python = - 3.10: py310-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} + 3.10: py310-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x}, static, publish 3.11: py311-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} - 3.12: py312-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x}, static, publish + 3.12: py312-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} 3.13: py313-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} - 3.14: py314-pytest{7.0, 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{1.0, 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} + 3.14: py314-pytest{ 7.x, 8.0, 8.x, 9.0, 9.x}-mypy{ 1.x, 2.0, 2.x}-xdist{2.0, 2.x, 3.0, 3.x} [testenv] constrain_package_deps = true @@ -37,6 +37,11 @@ deps = xdist3.0: pytest-xdist ~= 3.0.0 xdist3.x: pytest-xdist ~= 3.0 + ; xdist implicitly relied on pytest-forked for the py package until 3.0.2 (https://github.com/pytest-dev/pytest-xdist/pull/821). + ; pytest-forked removed the dependency on py in 1.7.0, though, leading to a ModuleNotFoundError. + xdist2.0: py ~= 1.11 + xdist2.x: py ~= 1.11 + packaging ~= 26.2 pytest-cov ~= 5.0.0 pytest-randomly ~= 3.15 @@ -58,7 +63,6 @@ commands = twine {posargs:check} {envtmpdir}/* [testenv:static] -basepython = py312 # pytest.Node.from_parent uses typing.Self deps = bandit ~= 1.9.0 black ~= 26.5.0