Skip to content

Commit 23659e9

Browse files
author
David Fritzsche
committed
Add support for mypy 0.960
1 parent b739568 commit 23659e9

File tree

7 files changed

+227
-73
lines changed

7 files changed

+227
-73
lines changed

.github/workflows/pythonpackage.yml

+58-8
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,48 @@ name: Python package
55
on: [push]
66

77
jobs:
8-
test:
8+
test-py310:
99
runs-on: ${{ matrix.os }}
1010
strategy:
1111
max-parallel: 4
1212
matrix:
1313
os: [ubuntu-latest, macos-latest, windows-latest]
14-
python-version: [3.7, 3.8, 3.9]
14+
python-version: ["3.10"]
1515

1616
steps:
17-
- uses: actions/checkout@v1
17+
- uses: actions/checkout@v3
1818
- name: Set up Python ${{ matrix.python-version }}
19-
uses: actions/setup-python@v1
19+
uses: actions/setup-python@v3
2020
with:
2121
python-version: ${{ matrix.python-version }}
2222
- name: Install dependencies
2323
run: |
24-
python -m pip install --upgrade pip
24+
python -m pip install -c constraints.txt pip
25+
python -m pip install -c constraints.txt invoke tox
26+
- name: Run tox
27+
env:
28+
TOX_PARALLEL_NO_SPINNER: "1"
29+
run: |
30+
inv mkdir build/coverage-data
31+
inv tox -e "py310-*"
32+
33+
test-py37-py38-py39:
34+
runs-on: ${{ matrix.os }}
35+
strategy:
36+
max-parallel: 8
37+
matrix:
38+
os: [ubuntu-latest, macos-latest, windows-latest]
39+
python-version: ["3.7", "3.8", "3.9"]
40+
41+
steps:
42+
- uses: actions/checkout@v3
43+
- name: Set up Python ${{ matrix.python-version }}
44+
uses: actions/setup-python@v3
45+
with:
46+
python-version: ${{ matrix.python-version }}
47+
- name: Install dependencies
48+
run: |
49+
python -m pip install -c constraints.txt pip
2550
python -m pip install -c constraints.txt invoke tox
2651
- name: Run tox
2752
env:
@@ -30,17 +55,42 @@ jobs:
3055
inv mkdir build/coverage-data
3156
inv tox -e "py-*"
3257
58+
test-py36:
59+
runs-on: ${{ matrix.os }}
60+
strategy:
61+
max-parallel: 4
62+
matrix:
63+
os: [ubuntu-latest, macos-latest, windows-latest]
64+
python-version: ["3.6"]
65+
66+
steps:
67+
- uses: actions/checkout@v3
68+
- name: Set up Python ${{ matrix.python-version }}
69+
uses: actions/setup-python@v3
70+
with:
71+
python-version: ${{ matrix.python-version }}
72+
- name: Install dependencies
73+
run: |
74+
python -m pip install pip==21.3.1
75+
python -m pip install invoke tox
76+
- name: Run tox
77+
env:
78+
TOX_PARALLEL_NO_SPINNER: "1"
79+
run: |
80+
inv mkdir build/coverage-data
81+
inv tox -e "py36-*"
82+
3383
lint:
3484
runs-on: ubuntu-latest
3585
strategy:
3686
max-parallel: 4
3787
matrix:
38-
python-version: [3.9]
88+
python-version: ["3.10"]
3989

4090
steps:
41-
- uses: actions/checkout@v1
91+
- uses: actions/checkout@v3
4292
- name: Set up Python ${{ matrix.python-version }}
43-
uses: actions/setup-python@v1
93+
uses: actions/setup-python@v3
4494
with:
4595
python-version: ${{ matrix.python-version }}
4696
- name: Install dependencies

constraints.txt

+22-22
Original file line numberDiff line numberDiff line change
@@ -6,60 +6,60 @@
66
#
77
attrs==21.4.0
88
binaryornot==0.4.4
9-
black==22.1.0
10-
boolean-py==3.8
9+
black==22.3.0
10+
boolean-py==4.0
1111
bump2version==1.0.1
12-
certifi==2021.10.8
12+
certifi==2022.5.18.1
1313
chardet==4.0.0
1414
charset-normalizer==2.0.12
15-
click==8.0.4
16-
coverage==6.3.2
15+
click==8.1.3
16+
coverage==6.4
1717
dflit==2.3.0.1
1818
dflit-core==2.3.0.1
1919
distlib==0.3.4
2020
docutils==0.18.1
21-
filelock==3.6.0
21+
filelock==3.7.0
2222
flake8==4.0.1
23-
flake8-black==0.3.2
23+
flake8-black==0.3.3
2424
flake8-isort==4.1.1
2525
fsfe-reuse==1.0.0
2626
idna==3.3
2727
iniconfig==1.1.1
28-
invoke==1.6.0
28+
invoke==1.7.1
2929
isort==5.10.1
30-
jinja2==3.0.3
31-
license-expression==21.6.14
32-
markupsafe==2.1.0
30+
jinja2==3.1.2
31+
license-expression==30.0.0
32+
markupsafe==2.1.1
3333
mccabe==0.6.1
3434
mypy==0.931
3535
mypy-extensions==0.4.3
3636
packaging==21.3
3737
pathspec==0.9.0
3838
pep517==0.12.0
39-
pip-tools==6.5.1
40-
platformdirs==2.5.1
39+
pip-tools==6.6.2
40+
platformdirs==2.5.2
4141
pluggy==1.0.0
4242
py==1.11.0
4343
pycodestyle==2.8.0
4444
pyflakes==2.4.0
45-
pyparsing==3.0.7
45+
pyparsing==3.0.9
4646
pytest==7.0.1
4747
pytest-cov==3.0.0
4848
pytest-html==3.1.1
49-
pytest-metadata==1.11.0
49+
pytest-metadata==2.0.1
5050
python-debian==0.1.43
5151
pytoml==0.1.21
5252
requests==2.27.1
53-
reuse==0.14.0
53+
reuse==1.0.0
5454
six==1.16.0
5555
testfixtures==6.18.5
5656
toml==0.10.2
5757
tomli==2.0.1
58-
tox==3.24.5
58+
tox==3.25.0
5959
tox-pyenv==1.1.0
60-
typing-extensions==4.1.1
61-
urllib3==1.26.8
62-
virtualenv==20.13.2
60+
typing-extensions==4.2.0
61+
urllib3==1.26.9
62+
virtualenv==20.14.1
6363
wheel==0.37.1
64-
pip==22.0.3
65-
setuptools==60.9.3
64+
pip==22.1.1
65+
setuptools==62.3.2

pyproject.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ classifiers = [
1818
"Operating System :: Microsoft :: Windows",
1919
"Operating System :: OS Independent",
2020
"Operating System :: POSIX",
21+
"Programming Language :: Python :: 3.6",
2122
"Programming Language :: Python :: 3.7",
2223
"Programming Language :: Python :: 3.8",
2324
"Programming Language :: Python :: 3.9",
@@ -29,10 +30,10 @@ dist-name = "pytest-mypy-testing"
2930
home-page = "https://github.com/davidfritzsche/pytest-mypy-testing"
3031
license = "Apache-2.0 OR MIT"
3132
requires = [
32-
"pytest<8",
33+
"pytest>=6,<8",
3334
"mypy",
3435
]
35-
requires-python = ">=3.7"
36+
requires-python = ">=3.6"
3637

3738
[tool.flit.entrypoints.pytest11]
3839
mypy-testing = "pytest_mypy_testing.plugin"

requirements.txt

+22-22
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@ attrs==21.4.0
88
# via pytest
99
binaryornot==0.4.4
1010
# via reuse
11-
black==22.1.0
11+
black==22.3.0
1212
# via
1313
# -r requirements.in
1414
# flake8-black
15-
boolean-py==3.8
15+
boolean-py==4.0
1616
# via
1717
# license-expression
1818
# reuse
1919
bump2version==1.0.1
2020
# via -r requirements.in
21-
certifi==2021.10.8
21+
certifi==2022.5.18.1
2222
# via requests
2323
chardet==4.0.0
2424
# via
2525
# binaryornot
2626
# python-debian
2727
charset-normalizer==2.0.12
2828
# via requests
29-
click==8.0.4
29+
click==8.1.3
3030
# via
3131
# black
3232
# pip-tools
33-
coverage[toml]==6.3.2
33+
coverage[toml]==6.4
3434
# via
3535
# -r requirements.in
3636
# pytest-cov
@@ -42,15 +42,15 @@ distlib==0.3.4
4242
# via virtualenv
4343
docutils==0.18.1
4444
# via dflit
45-
filelock==3.6.0
45+
filelock==3.7.0
4646
# via
4747
# tox
4848
# virtualenv
4949
flake8==4.0.1
5050
# via
5151
# flake8-black
5252
# flake8-isort
53-
flake8-black==0.3.2
53+
flake8-black==0.3.3
5454
# via -r requirements.in
5555
flake8-isort==4.1.1
5656
# via -r requirements.in
@@ -60,15 +60,15 @@ idna==3.3
6060
# via requests
6161
iniconfig==1.1.1
6262
# via pytest
63-
invoke==1.6.0
63+
invoke==1.7.1
6464
# via -r requirements.in
6565
isort==5.10.1
6666
# via flake8-isort
67-
jinja2==3.0.3
67+
jinja2==3.1.2
6868
# via reuse
69-
license-expression==21.6.14
69+
license-expression==30.0.0
7070
# via reuse
71-
markupsafe==2.1.0
71+
markupsafe==2.1.1
7272
# via jinja2
7373
mccabe==0.6.1
7474
# via flake8
@@ -86,9 +86,9 @@ pathspec==0.9.0
8686
# via black
8787
pep517==0.12.0
8888
# via pip-tools
89-
pip-tools==6.5.1
89+
pip-tools==6.6.2
9090
# via -r requirements.in
91-
platformdirs==2.5.1
91+
platformdirs==2.5.2
9292
# via
9393
# black
9494
# virtualenv
@@ -104,7 +104,7 @@ pycodestyle==2.8.0
104104
# via flake8
105105
pyflakes==2.4.0
106106
# via flake8
107-
pyparsing==3.0.7
107+
pyparsing==3.0.9
108108
# via packaging
109109
pytest==7.0.1
110110
# via
@@ -116,7 +116,7 @@ pytest-cov==3.0.0
116116
# via -r requirements.in
117117
pytest-html==3.1.1
118118
# via -r requirements.in
119-
pytest-metadata==1.11.0
119+
pytest-metadata==2.0.1
120120
# via pytest-html
121121
python-debian==0.1.43
122122
# via reuse
@@ -128,7 +128,7 @@ requests==2.27.1
128128
# via
129129
# dflit
130130
# reuse
131-
reuse==0.14.0
131+
reuse==1.0.0
132132
# via fsfe-reuse
133133
six==1.16.0
134134
# via
@@ -146,27 +146,27 @@ tomli==2.0.1
146146
# mypy
147147
# pep517
148148
# pytest
149-
tox==3.24.5
149+
tox==3.25.0
150150
# via
151151
# -r requirements.in
152152
# tox-pyenv
153153
tox-pyenv==1.1.0
154154
# via -r requirements.in
155-
typing-extensions==4.1.1
155+
typing-extensions==4.2.0
156156
# via mypy
157-
urllib3==1.26.8
157+
urllib3==1.26.9
158158
# via requests
159-
virtualenv==20.13.2
159+
virtualenv==20.14.1
160160
# via tox
161161
wheel==0.37.1
162162
# via pip-tools
163163

164164
# The following packages are considered to be unsafe in a requirements file:
165-
pip==22.0.3
165+
pip==22.1.1
166166
# via
167167
# -r requirements.in
168168
# pip-tools
169-
setuptools==60.9.3
169+
setuptools==62.3.2
170170
# via
171171
# -r requirements.in
172172
# pip-tools

0 commit comments

Comments
 (0)