From d0800b5d30156f4196b06e43af599331d9ff08e1 Mon Sep 17 00:00:00 2001 From: David Tucker Date: Tue, 8 Nov 2022 20:52:23 -0800 Subject: [PATCH 1/2] Add support for Python 3.11 --- .github/workflows/validation.yml | 2 +- setup.py | 3 ++- tests/test_pytest_mypy.py | 2 +- tox.ini | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 4e91771..3ef36e0 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 diff --git a/setup.py b/setup.py index ae12003..9dbc660 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,8 @@ def read(fname): 'pytest>=6.2; python_version>="3.10"', 'mypy>=0.500; python_version<"3.8"', 'mypy>=0.700; python_version>="3.8" and python_version<"3.9"', - 'mypy>=0.780; python_version>="3.9"', + 'mypy>=0.780; python_version>="3.9" and python_version<"3.11"', + 'mypy>=0.900; python_version>="3.11"', ], classifiers=[ "Development Status :: 4 - Beta", diff --git a/tests/test_pytest_mypy.py b/tests/test_pytest_mypy.py index cf19112..0f10dc5 100644 --- a/tests/test_pytest_mypy.py +++ b/tests/test_pytest_mypy.py @@ -402,7 +402,7 @@ def pyfunc(x: int) -> str: child = testdir.spawn_pytest( "--mypy --looponfail " + str(pyfile), - expect_timeout=30.0, + expect_timeout=60.0, ) num_tests = 2 diff --git a/tox.ini b/tox.ini index 627d2d0..474eadf 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,7 @@ envlist = py38-pytest{4.6, 5.0, 5.x, 6.0, 6.x, 7.0, 7.x}-mypy{0.71, 0.7x, 0.80, 0.8x, 0.90, 0.9x} py39-pytest{4.6, 5.0, 5.x, 6.0, 6.x, 7.0, 7.x}-mypy{0.78, 0.7x, 0.80, 0.8x, 0.90, 0.9x} py310-pytest{6.2, 6.x, 7.0, 7.x}-mypy{0.78, 0.7x, 0.80, 0.8x, 0.90, 0.9x} + py311-pytest{6.2, 6.x, 7.0, 7.x}-mypy{0.90, 0.9x} publish static @@ -18,6 +19,7 @@ python = 3.8: py38-pytest{4.6, 5.0, 5.x, 6.0, 6.x, 7.0, 7.x}-mypy{0.71, 0.7x, 0.80, 0.8x, 0.90, 0.9x}, publish, static 3.9: py39-pytest{4.6, 5.0, 5.x, 6.0, 6.x, 7.0, 7.x}-mypy{0.78, 0.7x, 0.80, 0.8x, 0.90, 0.9x} 3.10: py310-pytest{6.2, 6.x, 7.0, 7.x}-mypy{0.78, 0.7x, 0.80, 0.8x, 0.90, 0.9x} + 3.11: py311-pytest{6.2, 6.x, 7.0, 7.x}-mypy{0.90, 0.9x} [testenv] deps = From 53b091d4d4d077a35682e63b5258e718b12fdea4 Mon Sep 17 00:00:00 2001 From: David Tucker Date: Wed, 9 Nov 2022 09:02:58 -0800 Subject: [PATCH 2/2] Update the changelog --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index 7e1a4bf..160b7bd 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## [0.10.1](https://github.com/dbader/pytest-mypy/milestone/19) +* Work around https://github.com/python/mypy/issues/14042. +* Add support for Python 3.11. + ## [0.10.0](https://github.com/dbader/pytest-mypy/milestone/18) * Drop support for python<3.6.