Skip to content

Commit

Permalink
Test on newer mypy versions, and add to test matrix in GitHub Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
@domdfcoding
domdfcoding committed Aug 23, 2023
1 parent 5e17ed1 commit bf8e0b1
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 46 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/python_ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ jobs:
fail-fast: False
matrix:
config:
- {python-version: "3.6", testenvs: "py36-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.7", testenvs: "py37-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.8", testenvs: "py38-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.9", testenvs: "py39-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.10", testenvs: "py310-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.11", testenvs: "py311-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.12.0-rc.1", testenvs: "py312-dev-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36-attrs{21.2,21.4,22.2,latest}", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "pypy-3.8", testenvs: "pypy38-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "pypy-3.9", testenvs: "pypy39-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "3.6", testenvs: "py36-attrs{21.2,21.4,22.2,latest},py36-mypy{0.900,0.910,0.921,0.931},build", experimental: False}
- {python-version: "3.7", testenvs: "py37-attrs{21.2,21.4,22.2,latest},py37-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1},build", experimental: False}
- {python-version: "3.8", testenvs: "py38-attrs{21.2,21.4,22.2,latest},py38-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.9", testenvs: "py39-attrs{21.2,21.4,22.2,latest},py39-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.10", testenvs: "py310-attrs{21.2,21.4,22.2,latest},py310-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.11", testenvs: "py311-attrs{21.2,21.4,22.2,latest},py311-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.12.0-rc.1", testenvs: "py312-dev-attrs{21.2,21.4,22.2,latest},py312-dev-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36-attrs{21.2,21.4,22.2,latest},pypy36-mypy{}", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37-attrs{21.2,21.4,22.2,latest},pypy37-mypy{},build", experimental: True}
- {python-version: "pypy-3.8", testenvs: "pypy38-attrs{21.2,21.4,22.2,latest},pypy38-mypy{},build", experimental: True}
- {python-version: "pypy-3.9", testenvs: "pypy39-attrs{21.2,21.4,22.2,latest},pypy39-mypy{},build", experimental: True}

steps:
- name: Checkout 🛎️
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/python_ci_linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ jobs:
fail-fast: False
matrix:
config:
- {python-version: "3.6", testenvs: "py36-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.7", testenvs: "py37-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.8", testenvs: "py38-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.9", testenvs: "py39-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.10", testenvs: "py310-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.11", testenvs: "py311-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.12.0-rc.1", testenvs: "py312-dev-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "pypy-3.8", testenvs: "pypy38-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "pypy-3.9", testenvs: "pypy39-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "3.6", testenvs: "py36-attrs{21.2,21.4,22.2,latest},py36-mypy{0.900,0.910,0.921,0.931},build", experimental: False}
- {python-version: "3.7", testenvs: "py37-attrs{21.2,21.4,22.2,latest},py37-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1},build", experimental: False}
- {python-version: "3.8", testenvs: "py38-attrs{21.2,21.4,22.2,latest},py38-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.9", testenvs: "py39-attrs{21.2,21.4,22.2,latest},py39-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.10", testenvs: "py310-attrs{21.2,21.4,22.2,latest},py310-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.11", testenvs: "py311-attrs{21.2,21.4,22.2,latest},py311-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.12.0-rc.1", testenvs: "py312-dev-attrs{21.2,21.4,22.2,latest},py312-dev-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36-attrs{21.2,21.4,22.2,latest},pypy36-mypy{},build", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37-attrs{21.2,21.4,22.2,latest},pypy37-mypy{},build", experimental: True}
- {python-version: "pypy-3.8", testenvs: "pypy38-attrs{21.2,21.4,22.2,latest},pypy38-mypy{},build", experimental: True}
- {python-version: "pypy-3.9", testenvs: "pypy39-attrs{21.2,21.4,22.2,latest},pypy39-mypy{},build", experimental: True}

steps:
- name: Checkout 🛎️
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/python_ci_macos.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ jobs:
fail-fast: False
matrix:
config:
- {python-version: "3.6", testenvs: "py36-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.7", testenvs: "py37-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.8", testenvs: "py38-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.9", testenvs: "py39-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.10", testenvs: "py310-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.11", testenvs: "py311-attrs{21.2,21.4,22.2,latest},build", experimental: False}
- {python-version: "3.12.0-rc.1", testenvs: "py312-dev-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "pypy-3.7", testenvs: "pypy37-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "pypy-3.8", testenvs: "pypy38-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "pypy-3.9", testenvs: "pypy39-attrs{21.2,21.4,22.2,latest},build", experimental: True}
- {python-version: "3.6", testenvs: "py36-attrs{21.2,21.4,22.2,latest},py36-mypy{0.900,0.910,0.921,0.931},build", experimental: False}
- {python-version: "3.7", testenvs: "py37-attrs{21.2,21.4,22.2,latest},py37-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1},build", experimental: False}
- {python-version: "3.8", testenvs: "py38-attrs{21.2,21.4,22.2,latest},py38-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.9", testenvs: "py39-attrs{21.2,21.4,22.2,latest},py39-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.10", testenvs: "py310-attrs{21.2,21.4,22.2,latest},py310-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.11", testenvs: "py311-attrs{21.2,21.4,22.2,latest},py311-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: False}
- {python-version: "3.12.0-rc.1", testenvs: "py312-dev-attrs{21.2,21.4,22.2,latest},py312-dev-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest},build", experimental: True}
- {python-version: "pypy-3.7", testenvs: "pypy37-attrs{21.2,21.4,22.2,latest},pypy37-mypy{},build", experimental: True}
- {python-version: "pypy-3.8", testenvs: "pypy38-attrs{21.2,21.4,22.2,latest},pypy38-mypy{},build", experimental: True}
- {python-version: "pypy-3.9", testenvs: "pypy39-attrs{21.2,21.4,22.2,latest},pypy39-mypy{},build", experimental: True}

steps:
- name: Checkout 🛎️
Expand Down
19 changes: 19 additions & 0 deletions repo_helper.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,16 @@ conda_channels:

python_versions:
"3.6":
matrix_exclude:
mypy:
- "1.0.1"
- "1.2.0"
- "1.4.1"
- "latest"
"3.7":
matrix_exclude:
mypy:
- "latest"
"3.8":
"3.9":
"3.10":
Expand All @@ -34,6 +43,8 @@ python_versions:
- "0.921"
- "0.931"
- "1.0.1"
- "1.2.0"
- "1.4.1"
- "latest"

"pypy37":
Expand All @@ -44,6 +55,8 @@ python_versions:
- "0.921"
- "0.931"
- "1.0.1"
- "1.2.0"
- "1.4.1"
- "latest"

"pypy38":
Expand All @@ -54,6 +67,8 @@ python_versions:
- "0.921"
- "0.931"
- "1.0.1"
- "1.2.0"
- "1.4.1"
- "latest"

"pypy39":
Expand All @@ -64,6 +79,8 @@ python_versions:
- "0.921"
- "0.931"
- "1.0.1"
- "1.2.0"
- "1.4.1"
- "latest"


Expand Down Expand Up @@ -110,6 +127,8 @@ third_party_version_matrix:
- "0.921"
- "0.931"
- "1.0.1"
- "1.2.0"
- "1.4.1"
- "latest"

tox_unmanaged:
Expand Down
35 changes: 21 additions & 14 deletions tox.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ envlist =
pypy37-attrs{21.2,21.4,22.2,latest}
pypy38-attrs{21.2,21.4,22.2,latest}
pypy39-attrs{21.2,21.4,22.2,latest}
py36-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py37-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py38-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py39-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py310-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py311-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py312-dev-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py36-mypy{0.900,0.910,0.921,0.931}
py37-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1}
py38-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
py39-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
py310-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
py311-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
py312-dev-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
mypy
build
skip_missing_interpreters = True
Expand All @@ -60,13 +60,13 @@ test =
pypy37-attrs{21.2,21.4,22.2,latest}
pypy38-attrs{21.2,21.4,22.2,latest}
pypy39-attrs{21.2,21.4,22.2,latest}
py36-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py37-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py38-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py39-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py310-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py311-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py312-dev-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}
py36-mypy{0.900,0.910,0.921,0.931}
py37-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1}
py38-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
py39-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
py310-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
py311-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
py312-dev-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}
qa = mypy, lint
cov = py37-attrs21.2, coverage

Expand All @@ -86,6 +86,8 @@ deps =
mypy0.921: mypy~=0.921.0
mypy0.931: mypy~=0.931.0
mypy1.0.1: mypy~=1.0.1.0
mypy1.2.0: mypy~=1.2.0.0
mypy1.4.1: mypy~=1.4.1.0
mypylatest: mypy
extras = all
commands =
Expand Down Expand Up @@ -254,6 +256,11 @@ setenv =
PYTHONDEVMODE=1
PIP_DISABLE_PIP_VERSION_CHECK=1
[testenv:py312-dev-mypy{0.900,0.910,0.921,0.931,1.0.1,1.2.0,1.4.1,latest}]
setenv =
PYTHONDEVMODE=1
PIP_DISABLE_PIP_VERSION_CHECK=1
[testenv:py312-dev-mypy{0.900,0.910,0.921,0.931,1.0.1,latest}]
setenv =
PYTHONDEVMODE=1
Expand Down

0 comments on commit bf8e0b1

Please sign in to comment.