Skip to content

Commit 14f402f

Browse files
committed
test with normal Python 3.11
1 parent dcbabf6 commit 14f402f

File tree

2 files changed

+19
-31
lines changed

2 files changed

+19
-31
lines changed

.github/workflows/ci-tests.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ jobs:
5151
run: sudo usermod -c 'CI Runner' $(whoami)
5252

5353
- name: Set up Python
54-
if: matrix.py-ver-minor != 11
5554
uses: actions/setup-python@v4
5655
with:
5756
python-version: ${{ env.py-semver }}
@@ -60,16 +59,6 @@ jobs:
6059
requirements.txt
6160
tox.ini
6261
63-
- name: Set up Python 3.11.0-rc.2
64-
if: matrix.py-ver-minor == 11
65-
uses: actions/setup-python@v4
66-
with:
67-
python-version: 3.11.0-rc.2
68-
cache: pip
69-
cache-dependency-path: |
70-
requirements.txt
71-
tox.ini
72-
7362
- name: Upgrade setuptools and install tox
7463
run: |
7564
pip install -U pip setuptools wheel
@@ -101,8 +90,8 @@ jobs:
10190
step: [lintreadme, shellcheck, pydocstyle]
10291

10392
env:
104-
py-semver: "3.10"
105-
TOXENV: ${{ format('py310-{0}', matrix.step) }}
93+
py-semver: "3.11"
94+
TOXENV: ${{ format('py311-{0}', matrix.step) }}
10695

10796
steps:
10897
- uses: actions/checkout@v3
@@ -180,7 +169,7 @@ jobs:
180169
- name: Set up Python
181170
uses: actions/setup-python@v4
182171
with:
183-
python-version: "3.10" # quoted, otherwise that turns into the number 3.1
172+
python-version: 3.11
184173
cache: pip
185174
cache-dependency-path: |
186175
requirements.txt
@@ -218,7 +207,7 @@ jobs:
218207
- name: Set up Python
219208
uses: actions/setup-python@v4
220209
with:
221-
python-version: "3.10"
210+
python-version: 3.11
222211
cache: pip
223212
cache-dependency-path: |
224213
requirements.txt

tox.ini

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ envlist =
44
py3{6,7,8,9,10,11}-unit
55
py3{6,7,8,9,10,11}-bandit
66
py3{7,8,9,10,11}-mypy
7-
py310-lintreadme
8-
py310-shellcheck
9-
py310-pydocstyle
7+
py311-lintreadme
8+
py311-shellcheck
9+
py311-pydocstyle
1010

1111
skip_missing_interpreters = True
1212

@@ -32,9 +32,9 @@ description =
3232
py3{6,7,8,9,10,11}-lint: Lint the Python code
3333
py3{6,7,8,9,10,11}-bandit: Search for common security issues
3434
py3{7,8,9,10,11}-mypy: Check for type safety
35-
py310-pydocstyle: docstring style checker
36-
py310-shellcheck: syntax check for shell scripts
37-
py310-lintreadme: Lint the README.rst→.md conversion
35+
py311-pydocstyle: docstring style checker
36+
py311-shellcheck: syntax check for shell scripts
37+
py311-lintreadme: Lint the README.rst→.md conversion
3838

3939
passenv =
4040
CI
@@ -51,29 +51,28 @@ deps =
5151
py3{6,7,8,9,10,11}-bandit: bandit
5252
py3{6,7,8,9,10,11}-bandit: importlib_metadata != 4.8.0
5353
py3{7,8,9,10,11}-mypy: -rmypy-requirements.txt
54-
py310-pydocstyle: pydocstyle
55-
py310-pydocstyle: diff-cover
56-
py310-lintreadme: twine
57-
py310-lintreadme: wheel
58-
py310-lintreadme: readme_renderer[md]
54+
py311-pydocstyle: pydocstyle
55+
py311-pydocstyle: diff-cover
56+
py311-lintreadme: twine
57+
py311-lintreadme: build
58+
py311-lintreadme: readme_renderer[md]
5959

6060
setenv =
6161
py3{6,7,8,9,10,11}-unit: LC_ALL = C.UTF-8
6262

6363
commands_pre =
6464
py3{6,7,8,9,10,11}-unit: python -m pip install -U pip setuptools wheel
65-
py310-lintreadme: python setup.py sdist --dist-dir {distdir}
66-
py310-lintreadme: python setup.py bdist_wheel --dist-dir {distdir}
65+
py311-lintreadme: python -m build --outdir {distdir}
6766

6867
commands =
6968
py3{6,7,8,9,10,11}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
7069
py3{6,7,8,9,10,11}-bandit: bandit -r cwltool
7170
py3{6,7,8,9,10,11}-lint: make flake8 format-check codespell
7271
py3{7,8,9,10,11}-mypy: make mypy mypyc PYTEST_EXTRA={posargs}
7372
py37-mypy: make mypy_3.6
74-
py310-shellcheck: make shellcheck
75-
py310-pydocstyle: make diff_pydocstyle_report
76-
py310-lintreadme: twine check {distdir}/*
73+
py311-shellcheck: make shellcheck
74+
py311-pydocstyle: make diff_pydocstyle_report
75+
py311-lintreadme: twine check {distdir}/*
7776

7877
skip_install =
7978
py3{6,7,8,9,10,11}-{bandit,lint,mypy,shellcheck,pydocstyle,lintreadme}: true

0 commit comments

Comments
 (0)