test with Python 3.13.0-rc.1

no mypyc support yet

fixup

Author: mr-c

.github/workflows/ci-tests.yml

@@ -20,12 +20,10 @@ jobs:
     strategy:
       matrix:
         py-ver-major: [3]
-        py-ver-minor: [8, 9, 10, 11, 12]
-        step: [lint, unit, mypy, memleak]
+        py-ver-minor: [8, 9, 10, 11, 12, "13.0-rc.1"]
 
     env:
       py-semver: ${{ format('{0}.{1}', matrix.py-ver-major, matrix.py-ver-minor) }}
-      TOXENV: ${{ format('py{0}{1}-{2}', matrix.py-ver-major, matrix.py-ver-minor, matrix.step) }}
 
     steps:
       - uses: actions/checkout@v4
@@ -47,7 +45,6 @@ jobs:
           pip install 'tox<4' tox-gh-actions
 
       - name: MyPy cache
-        if: ${{ matrix.step == 'mypy' }}
         uses: actions/cache@v4
         with:
           path: .mypy_cache/${{ env.py-semver }}
@@ -57,7 +54,6 @@ jobs:
         run: tox
 
       - name: Upload coverage to Codecov
-        if: ${{ matrix.step == 'unit' }}
         uses: codecov/codecov-action@v4
         with:
           fail_ci_if_error: true
@@ -75,7 +71,7 @@ jobs:
 
     env:
       py-semver: "3.12"
-      TOXENV: ${{ format('py312-{0}', matrix.step) }}
+      TOXENV: ${{ matrix.step }}
 
     steps:
       - uses: actions/checkout@v4
@@ -86,12 +82,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ env.py-semver }}
-
-      - name: Cache for pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ matrix.step }}-${{ hashFiles('requirements.txt') }}
+          cache: pip
 
       - name: Upgrade setuptools and install tox
         run: |

setup.py

@@ -116,7 +116,7 @@
     download_url="https://github.com/common-workflow-language/schema_salad/releases",
     ext_modules=ext_modules,
     license="Apache 2.0",
-    python_requires=">=3.8,<3.13",
+    python_requires=">=3.8,<3.14",
     use_scm_version=True,
     setup_requires=pytest_runner + ["setuptools_scm>=8.0.4,<9"],
     packages=["schema_salad", "schema_salad.tests", "schema_salad.avro"],

tox.ini

@@ -1,11 +1,11 @@
 [tox]
 envlist =
-  py3{8,9,10,11,12}-lint,
-  py3{8,9,10,11,12}-unit,
-  py3{8,9,10,11,12}-mypy,
+  py3{8,9,10,11,12,13}-lint,
+  py3{8,9,10,11,12,13}-unit,
+  py3{8,9,10,11,12,13}-mypy,
   py3{8,9,10,11,12}-memleak,
-  py312-lintreadme,
-  py312-pydocstyle
+  lintreadme,
+  pydocstyle
 
 skip_missing_interpreters = True
 
@@ -20,59 +20,62 @@ python =
   3.10: py310
   3.11: py311
   3.12: py312
+  3.13: py313
 
 [testenv]
 description =
-  py3{8,9,10,11,12}-unit: Run the unit tests
-  py3{8,9,10,11,12}-lint: Lint the Python code and search for common security issues
-  py3{8,9,10,11,12}-mypy: Check for type safety
+  py3{8,9,10,11,12,13}-unit: Run the unit tests
+  py3{8,9,10,11,12,13}-lint: Lint the Python code and search for common security issues
+  py3{8,9,10,11,12,13}-mypy: Check for type safety
   py3{8,9,10,11,12}-memleak: Simple test for memory leaks with mypyc
-  py312-pydocstyle: docstring style checker
-  py312-lintreadme: Lint the README.rst->.md conversion
+  pydocstyle: docstring style checker
+  lintreadme: Lint the README.rst->.md conversion
 
 passenv =
   CI
   GITHUB_*
 deps =
-  py3{8,9,10,11,12}-{unit,mypy}: -rrequirements.txt
-  py3{8,9,10,11,12}-{unit,mypy}: -rtest-requirements.txt
-  py3{8,9,10,11,12}-lint: -rlint-requirements.txt
-  py3{8,9,10,11,12}-{mypy,memleak,lint}: -rmypy-requirements.txt
-  py3{8,9,10,11,12}-memleak: cwl-utils
-  py3{8,9,10,11,12}-memleak: objgraph
+  py3{8,9,10,11,12,13}-{unit,mypy}: -rrequirements.txt
+  py3{8,9,10,11,12,13}-{unit,mypy}: -rtest-requirements.txt
+  py3{8,9,10,11,12,13}-lint: -rlint-requirements.txt
+  py3{8,9,10,11,12,13}-{mypy,memleak,lint}: -rmypy-requirements.txt
+  py3{8,9,10,11,12,13}-memleak: cwl-utils
+  py3{8,9,10,11,12,13}-memleak: objgraph
 # don't forget to update dev-requirements.txt as well
 
 setenv =
-  py3{8,9,10,11,12}-unit: LC_ALL = C.UTF-8
+  py3{8,9,10,11,12,13}-unit: LC_ALL = C.UTF-8
 
 commands =
-  py3{8,9,10,11,12}-unit: python -m pip install -U pip setuptools wheel
-  py3{8,9,10,11,12}-unit: make --always-make coverage-report coverage.xml PYTEST_EXTRA="{posargs}"
-  py3{8,9,10,11,12}-lint: make bandit flake8 format-check diff_pylint_report diff_pydocstyle_report
-  py3{8,9,10,11,12}-mypy: make mypy mypyc
-  py3{8,9,10,11,12}-memleak: make mypyi
-  py3{8,9,10,11,12}-memleak: python schema_salad/tests/memory-leak-check.py schema_salad/tests/test_real_cwl/ICGC-TCGA-PanCancer/complete/preprocess_vcf.cwl
+  py3{8,9,10,11,12,13}-unit: python -m pip install -U pip setuptools wheel
+  py3{8,9,10,11,12,13}-unit: make --always-make coverage-report coverage.xml PYTEST_EXTRA="{posargs}"
+  py3{8,9,10,11,12,13}-lint: make bandit flake8 format-check diff_pylint_report diff_pydocstyle_report
+  py3{8,9,10,11,12,13}-mypy: make mypy
+  py3{8,9,10,11,12}-mypy: make mypyc
+  py3{8,9,10,11,12,13}-memleak: make mypyi
+  py3{8,9,10,11,12,13}-memleak: python schema_salad/tests/memory-leak-check.py schema_salad/tests/test_real_cwl/ICGC-TCGA-PanCancer/complete/preprocess_vcf.cwl
 
 allowlist_externals =
-  py3{8,9,10,11,12}-lint: flake8
-  py3{8,9,10,11,12}-lint: black
-  py3{8,9,10,11,12}-{mypy,memleak,shellcheck,lint,lintreadme,unit}: make
+  py3{8,9,10,11,12,13}-lint: flake8
+  py3{8,9,10,11,12,13}-lint: black
+  py3{8,9,10,11,12,13}-{mypy,memleak,shellcheck,lint,unit}: make
+  lintreadme: make
 
 skip_install =
-  py3{8,9,10,11,12}-lint: true
+  py3{8,9,10,11,12,13}-lint: true
 
 extras =
-  py3{8,9,10,11,12}-unit: pycodegen
+  py3{8,9,10,11,12,13}-unit: pycodegen
 
-[testenv:py312-pydocstyle]
+[testenv:pydocstyle]
 allowlist_externals = make
 commands = make diff_pydocstyle_report
 deps =
     pydocstyle
     diff-cover
 skip_install = true
 
-[testenv:py312-lintreadme]
+[testenv:lintreadme]
 description = Lint the README.rst->.md conversion
 commands =
   make clean dist