Skip to content

Commit bab56aa

Browse files
committed
default to testing with Python 3.12
1 parent 7a7d1ca commit bab56aa

File tree

4 files changed

+29
-30
lines changed

4 files changed

+29
-30
lines changed

.github/workflows/ci-tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ jobs:
9595
step: [lintreadme, shellcheck, pydocstyle]
9696

9797
env:
98-
py-semver: "3.11"
99-
TOXENV: ${{ format('py311-{0}', matrix.step) }}
98+
py-semver: "3.12"
99+
TOXENV: ${{ format('py312-{0}', matrix.step) }}
100100

101101
steps:
102102
- uses: actions/checkout@v4
@@ -125,7 +125,7 @@ jobs:
125125
name: No leftovers
126126
runs-on: ubuntu-22.04
127127
env:
128-
py-semver: "3.11"
128+
py-semver: "3.12"
129129
steps:
130130
- uses: actions/checkout@v4
131131
with:
@@ -196,7 +196,7 @@ jobs:
196196
- name: Set up Python
197197
uses: actions/setup-python@v4
198198
with:
199-
python-version: 3.11
199+
python-version: 3.12
200200
cache: pip
201201

202202
- name: "Test CWL ${{ matrix.cwl-version }} conformance"
@@ -226,7 +226,7 @@ jobs:
226226
- name: Set up Python
227227
uses: actions/setup-python@v4
228228
with:
229-
python-version: 3.11
229+
python-version: 3.12
230230
cache: pip
231231
cache-dependency-path: |
232232
requirements.txt
@@ -256,15 +256,15 @@ jobs:
256256
name: Test on macos-latest
257257
runs-on: macos-latest
258258
env:
259-
TOXENV: py311-unit
259+
TOXENV: py312-unit
260260
steps:
261261
- uses: actions/checkout@v4
262262
with:
263263
fetch-depth: 0
264264
- name: Set up Python
265265
uses: actions/setup-python@v4
266266
with:
267-
python-version: 3.11
267+
python-version: 3.12
268268
cache: pip
269269
cache-dependency-path: |
270270
requirements.txt

cwltool.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11-alpine3.17 as builder
1+
FROM python:3.12-alpine3.17 as builder
22

33
RUN apk add --no-cache git gcc python3-dev libxml2-dev libxslt-dev libc-dev linux-headers
44

@@ -8,20 +8,20 @@ RUN CWLTOOL_USE_MYPYC=1 MYPYPATH=mypy-stubs pip wheel --no-binary schema-salad \
88
--wheel-dir=/wheels .[deps] # --verbose
99
RUN rm /wheels/schema_salad*
1010
RUN pip install "black~=22.0"
11-
# galaxy-util 22.1.2 depends on packaging<22, but black 23.x needs packaging>22
11+
# galaxy-util 22.1.x depends on packaging<22, but black 23.x needs packaging>22
1212
RUN SCHEMA_SALAD_USE_MYPYC=1 MYPYPATH=mypy-stubs pip wheel --no-binary schema-salad \
1313
$(grep schema.salad requirements.txt) "black~=22.0" --wheel-dir=/wheels # --verbose
1414
RUN pip install --force-reinstall --no-index --no-warn-script-location \
1515
--root=/pythonroot/ /wheels/*.whl
1616
# --force-reinstall to install our new mypyc compiled schema-salad package
1717

18-
FROM python:3.11-alpine3.17 as module
18+
FROM python:3.12-alpine3.17 as module
1919
LABEL maintainer [email protected]
2020

2121
RUN apk add --no-cache docker nodejs 'graphviz<8' libxml2 libxslt
2222
COPY --from=builder /pythonroot/ /
2323

24-
FROM python:3.11-alpine3.17
24+
FROM python:3.12-alpine3.17
2525
LABEL maintainer [email protected]
2626

2727
RUN apk add --no-cache docker nodejs 'graphviz<8' libxml2 libxslt

release-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ run_tests() {
2525
"${test_prefix}"bin/py.test "--ignore=${mod_loc}/schemas/" \
2626
--pyargs -x ${module} -n auto --dist=loadfile
2727
}
28-
pipver=20.3.4 # minimum required version of pip for Python 3.10
29-
setuptoolsver=52.0.0
28+
pipver=23.1 # minimum required version of pip for Python 3.12
29+
setuptoolsver=67.6.1 # required for Python 3.12
3030
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
3131

3232
rm -Rf testenv? || /bin/true

tox.ini

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

1111
skip_missing_interpreters = True
1212

@@ -31,9 +31,9 @@ description =
3131
py3{8,9,10,11,12}-lint: Lint the Python code
3232
py3{8,9,10,11,12}-bandit: Search for common security issues
3333
py3{8,9,10,11,12}-mypy: Check for type safety
34-
py311-pydocstyle: docstring style checker
35-
py311-shellcheck: syntax check for shell scripts
36-
py311-lintreadme: Lint the README.rst→.md conversion
34+
py312-pydocstyle: docstring style checker
35+
py312-shellcheck: syntax check for shell scripts
36+
py312-lintreadme: Lint the README.rst→.md conversion
3737

3838
passenv =
3939
CI
@@ -50,28 +50,27 @@ deps =
5050
py3{8,9,10,11,12}-bandit: bandit
5151
py3{8,9,10,11,12}-bandit: importlib_metadata != 4.8.0
5252
py3{8,9,10,11,12}-mypy: -rmypy-requirements.txt
53-
py311-pydocstyle: pydocstyle
54-
py311-pydocstyle: diff-cover
55-
py311-lintreadme: twine
56-
py311-lintreadme: build
57-
py311-lintreadme: readme_renderer[rst]
53+
py312-pydocstyle: pydocstyle
54+
py312-pydocstyle: diff-cover
55+
py312-lintreadme: twine
56+
py312-lintreadme: build
57+
py312-lintreadme: readme_renderer[rst]
5858

5959
setenv =
6060
py3{8,9,10,11,12}-unit: LC_ALL = C.UTF-8
6161

6262
commands_pre =
6363
py3{8,9,10,11,12}-unit: python -m pip install -U pip setuptools wheel
64-
py311-lintreadme: python -m build --outdir {distdir}
64+
py312-lintreadme: python -m build --outdir {distdir}
6565

6666
commands =
6767
py3{8,9,10,11,12}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
6868
py3{8,9,10,11,12}-bandit: bandit -r cwltool
6969
py3{8,9,10,11,12}-lint: make flake8 format-check codespell-check
70-
py3{8,9,10,11,12}-mypy: make mypy PYTEST_EXTRA={posargs}
71-
py3{8,9,10,11}-mypy: make mypyc PYTEST_EXTRA={posargs}
72-
py311-shellcheck: make shellcheck
73-
py311-pydocstyle: make diff_pydocstyle_report
74-
py311-lintreadme: twine check {distdir}/*
70+
py3{8,9,10,11,12}-mypy: make mypy mypyc PYTEST_EXTRA={posargs}
71+
py312-shellcheck: make shellcheck
72+
py312-pydocstyle: make diff_pydocstyle_report
73+
py312-lintreadme: twine check {distdir}/*
7574

7675
skip_install =
7776
py3{8,9,10,11,12}-{bandit,lint,mypy,shellcheck,pydocstyle,lintreadme}: true

0 commit comments

Comments
 (0)