From cc80d610e04e88dae8b0e05ae3261b8518d8c7ee Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 23 Dec 2021 23:11:03 +0100 Subject: [PATCH 1/4] build(deps-dev): bump mypy (0.910 => 0.930) --- .pre-commit-config.yaml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 25be0caa502..3020b74ec93 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,7 +34,7 @@ repos: - id: pyupgrade args: [--keep-percent-format] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.910 # NOTE: keep this in sync with setup.py. + rev: v0.930 # NOTE: keep this in sync with setup.py. hooks: - id: mypy files: ^(src/|testing/) diff --git a/setup.py b/setup.py index 4982b2381a8..7d5493363a5 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ def main(): "xmlschema", ], # fmt: on "checkqa-mypy": [ - "mypy==v0.910", # keep this in sync with .pre-commit-config.yaml. + "mypy==v0.930", # keep this in sync with .pre-commit-config.yaml. "types-setuptools", ], }, From a689a2e6b8761693a7b136807e2ade39acdb7c9a Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 23 Dec 2021 23:23:21 +0100 Subject: [PATCH 2/4] tox: mypy_ci_min: pin mypy to v0.910 --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index f1e7319658c..e1cc8958ab6 100644 --- a/tox.ini +++ b/tox.ini @@ -95,9 +95,11 @@ commands = mypy {posargs:src testing} # Checks minimum supported Python version, and general checks. # This uses the actual Python version, so that mypy does not fail with # unsupported deps (e.g. packaging 21 on py35, causing a mypy syntax error). +# NOTE: mypy v0.920 dropped support for Python 3.5, so it is pinned to v0.910. [testenv:mypy_ci_min] basepython = python3.5 deps = {[testenv:mypy]deps} + mypy==v0.910 extras = {[testenv:mypy]extras} whitelist_externals = sh commands = From abe5b5e4066eef8510a0a9088e30022b947c8f9e Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 24 Dec 2021 01:26:00 +0100 Subject: [PATCH 3/4] tox: inline deps for checkqa-mypy --- tox.ini | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index e1cc8958ab6..d53cdd7b570 100644 --- a/tox.ini +++ b/tox.ini @@ -96,11 +96,14 @@ commands = mypy {posargs:src testing} # This uses the actual Python version, so that mypy does not fail with # unsupported deps (e.g. packaging 21 on py35, causing a mypy syntax error). # NOTE: mypy v0.920 dropped support for Python 3.5, so it is pinned to v0.910. +# And since tox does not allow for overriding deps from extras, they are +# inlined here. [testenv:mypy_ci_min] basepython = python3.5 -deps = {[testenv:mypy]deps} +deps = mypy==v0.910 -extras = {[testenv:mypy]extras} + types-setuptools +extras = whitelist_externals = sh commands = mypy --python-version 3.5 --warn-unused-ignores {posargs:src testing} From 27094b99d2ead53d0f3234f87b602a5fd6c79c14 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Jan 2022 14:01:04 +0100 Subject: [PATCH 4/4] mypy v0.931 --- .pre-commit-config.yaml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3020b74ec93..9c209e29cc5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,7 +34,7 @@ repos: - id: pyupgrade args: [--keep-percent-format] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.930 # NOTE: keep this in sync with setup.py. + rev: v0.931 # NOTE: keep this in sync with setup.py. hooks: - id: mypy files: ^(src/|testing/) diff --git a/setup.py b/setup.py index 7d5493363a5..b09e2b30cfb 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ def main(): "xmlschema", ], # fmt: on "checkqa-mypy": [ - "mypy==v0.930", # keep this in sync with .pre-commit-config.yaml. + "mypy==v0.931", # keep this in sync with .pre-commit-config.yaml. "types-setuptools", ], },