Skip to content

Commit 40579be

Browse files
committed
Don't run mypy under Python3.6; check 3.6 path via Python3.7
1 parent adec5d7 commit 40579be

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

.github/workflows/ci-tests.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ jobs:
2121
py-ver-major: [3]
2222
py-ver-minor: [6, 7, 8, 9, 10, 11]
2323
step: [lint, unit, mypy]
24+
exclude:
25+
- py-ver-major: 3
26+
py-ver-minor: 6
27+
step: mypy
28+
- py-ver-major: 3
29+
py-ver-minor: 6
30+
step: lint
2431

2532
env:
2633
py-semver: ${{ format('{0}.{1}', matrix.py-ver-major, matrix.py-ver-minor) }}

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,12 @@ mypy: $(PYSOURCES)
167167
fi # if minimally required ruamel.yaml version is 0.15.99 or greater, than the above can be removed
168168
MYPYPATH=$$MYPYPATH:mypy-stubs mypy $^
169169

170+
mypy_3.6: $(filter-out setup.py,$(PYSOURCES))
171+
MYPYPATH=$$MYPYPATH:mypy-stubs mypy --python-version 3.6 $^
172+
173+
shellcheck: FORCE
174+
shellcheck testing.sh release-test.sh
175+
170176
pyupgrade: $(PYSOURCES)
171177
pyupgrade --exit-zero-even-if-changed --py36-plus $^
172178

tox.ini

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ envlist =
33
py{36,37,38,39,310,311}-lint,
44
py{36,37,38,39,310,311}-unit,
55

6-
py{36,37,38,39,310,311}-mypy,
6+
py{37,38,39,310,311}-mypy,
77
py39-lintreadme,
88
py39-pydocstyle
99

@@ -25,7 +25,7 @@ python =
2525
description =
2626
py{36,37,38,39,310,311}-unit: Run the unit tests
2727
py{36,37,38,39,310,311}-lint: Lint the Python code
28-
py{36,37,38,39,310,311}-mypy: Check for type safety
28+
py{37,38,39,310,311}-mypy: Check for type safety
2929
py311-pydocstyle: docstring style checker
3030
py311-lintreadme: Lint the README.rst->.md conversion
3131

@@ -37,7 +37,7 @@ deps =
3737
py{36,37,38,39,310,311}-{unit,mypy}: -rtest-requirements.txt
3838
py{36,37,38,39,310,311}-lint: flake8-bugbear
3939
py{36,37,38,39,310,311}-lint: black
40-
py{36,37,38,39,310,311}-mypy: -rmypy-requirements.txt
40+
py{37,38,39,310,311}-mypy: -rmypy-requirements.txt
4141

4242
setenv =
4343
py{36,37,38,39,310,311}-unit: LC_ALL = C.UTF-8
@@ -47,12 +47,13 @@ commands =
4747
py{36,37,38,39,310,311}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
4848
py{36,37,38,39,310,311}-lint: make flake8
4949
py{36,37,38,39,310,311}-lint: make format-check
50-
py{36,37,38,39,310,311}-mypy: make mypy
50+
py{37,38,39,310,311}-mypy: make mypy
5151

5252
allowlist_externals =
5353
py{36,37,38,39,310,311}-lint: flake8
5454
py{36,37,38,39,310,311}-lint: black
5555
py{36,37,38,39,310,311}-{mypy,shellcheck,lint,unit}: make
56+
py37-mypy: make mypy_3.6
5657

5758
skip_install =
5859
py{36,37,38,39,310,311}-lint: true

0 commit comments

Comments
 (0)