Drop Python 3.6 testing

This is now a Python 3.8+ codebase

Default to Python 3.12 for release testing and others

Author: mr-c

.github/workflows/ci-tests.yml

@@ -21,15 +21,8 @@ jobs:
       matrix:
         # The README.rst file mentions the versions tested, please update it as well
         py-ver-major: [3]
-        py-ver-minor: [6, 8, 9, 10, 11, 12]
+        py-ver-minor: [8, 9, 10, 11, 12]
         step: [lint, unit, mypy, bandit]
-        exclude:
-          - py-ver-major: 3
-            py-ver-minor: 6
-            step: mypy
-          - py-ver-major: 3
-            py-ver-minor: 6
-            step: lint
 
     env:
       py-semver: ${{ format('{0}.{1}', matrix.py-ver-major, matrix.py-ver-minor) }}
@@ -44,7 +37,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ env.py-semver }}
-          allow-prereleases: true
           cache: pip
           cache-dependency-path: |
             requirements.txt
@@ -83,8 +75,8 @@ jobs:
         step: [lintreadme, pydocstyle]
 
     env:
-      py-semver: "3.11"
-      TOXENV: ${{ format('py311-{0}', matrix.step) }}
+      py-semver: "3.12"
+      TOXENV: ${{ format('py312-{0}', matrix.step) }}
 
     steps:
       - uses: actions/checkout@v4
@@ -124,7 +116,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
           cache: pip
           cache-dependency-path: |
             requirements.txt

Makefile

@@ -168,11 +168,9 @@ mypy3: mypy
 mypy: $(filter-out setup.py gittagger.py,$(PYSOURCES))
 	MYPYPATH=$$MYPYPATH:mypy-stubs mypy $^
 
-mypy_3.6: $(filter-out setup.py gittagger.py,$(PYSOURCES))
-	MYPYPATH=$$MYPYPATH:mypy-stubs mypy --python-version 3.6 $^
-
 pyupgrade: $(filter-out schema_salad/metaschema.py,$(PYSOURCES))
-	pyupgrade --exit-zero-even-if-changed --py36-plus $^
+	pyupgrade --exit-zero-even-if-changed --py38-plus $^
+	auto-walrus $^
 
 release-test: FORCE
 	git diff-index --quiet HEAD -- || ( echo You have uncommitted changes, please commit them and try again; false )

README.rst

@@ -32,7 +32,7 @@ This is a testing tool for checking the output of Tools and Workflows described
 with the Common Workflow Language.  Among other uses, it is used to run the CWL
 conformance tests.
 
-This is written and tested for Python 3.6, 3.7, 3.8, 3.9, 3.10, and 3.11.
+This is written and tested for Python 3.8, 3.9, 3.10, 3.11, and 3.12.
 
 .. contents:: Table of Contents
    :local:

cwltest/argparser.py

@@ -107,8 +107,7 @@ def arg_parser() -> argparse.ArgumentParser:
         help="Create JSON badges and store them in this directory.",
     )
 
-    pkg = pkg_resources.require("cwltest")
-    if pkg:
+    if pkg := pkg_resources.require("cwltest"):
         ver = f"{sys.argv[0]} {pkg[0].version}"
     else:
         ver = "{} {}".format(sys.argv[0], "unknown version")

cwltest/compare.py

@@ -37,10 +37,9 @@ def _check_keys(
 
 
 def _compare_contents(expected: Dict[str, Any], actual: Dict[str, Any]) -> None:
-    expected_contents = expected["contents"]
     with open(actual["path"]) as f:
         actual_contents = f.read()
-    if expected_contents != actual_contents:
+    if (expected_contents := expected["contents"]) != actual_contents:
         raise CompareFail.format(
             expected,
             actual,

cwltest/plugin.py

@@ -13,6 +13,7 @@
     Iterator,
     List,
     Optional,
+    Protocol,
     Set,
     Tuple,
     Union,
@@ -21,7 +22,6 @@
 
 import pytest
 from cwltest.compare import CompareFail, compare
-from typing_extensions import Protocol
 
 from cwltest import REQUIRED, UNSUPPORTED_FEATURE, logger, utils
 
@@ -207,8 +207,7 @@ def _add_global_properties(self) -> None:
         """Nonfunctional if xdist is installed and anything besides "-n 0" is used."""
         from _pytest.junitxml import xml_key
 
-        xml = self.config._store.get(xml_key, None)
-        if xml:
+        if xml := self.config._store.get(xml_key, None):
             xml.add_global_property("runner", self.config.getoption("cwl_runner"))
             xml.add_global_property(
                 "runner_extra_args", self.config.getoption("cwl_args")
@@ -381,8 +380,7 @@ def pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None:
         nunsupported,
         _,
     ) = utils.parse_results(results, tests)
-    cwl_badgedir = session.config.getoption("cwl_badgedir")
-    if cwl_badgedir:
+    if cwl_badgedir := session.config.getoption("cwl_badgedir"):
         utils.generate_badges(cwl_badgedir, ntotal, npassed)
 
 

dev-requirements.txt

@@ -12,3 +12,4 @@ autoflake
 flake8-bugbear
 pyupgrade
 bandit
+auto-walrus

release-test.sh

@@ -18,8 +18,8 @@ else
     HEAD=$(git rev-parse HEAD)
 fi
 run_tests="bin/py.test -p pytester --pyargs ${module}"
-pipver=20.3.3  # minimum required version of pip for Python 3.10
-setuptoolsver=50.0.1  # required for Python 3.10
+pipver=23.1  # minimum required version of pip for Python 3.12
+setuptoolsver=67.6.1  # required for Python 3.12
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 rm -Rf testenv? || /bin/true

requirements.txt

@@ -2,4 +2,3 @@ schema-salad >= 5.0.20200220195218, < 9
 junit-xml >= 1.8
 pytest >= 7, < 8
 defusedxml
-typing-extensions

setup.py

@@ -30,7 +30,7 @@
     url="https://github.com/common-workflow-language/cwltest",
     download_url="https://github.com/common-workflow-language/cwltest",
     license="Apache 2.0",
-    python_requires=">=3.6, <4",
+    python_requires=">=3.8, <4",
     setup_requires=[] + pytest_runner,
     packages=["cwltest", "cwltest.tests"],
     package_dir={"cwltest.tests": "tests"},
@@ -64,7 +64,6 @@
         "Operating System :: POSIX",
         "Operating System :: MacOS :: MacOS X",
         "Development Status :: 5 - Production/Stable",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",

tox.ini

@@ -1,11 +1,11 @@
 [tox]
 envlist =
   py3{8,9,10,11,12}-lint,
-  py3{6,8,9,10,11,12}-unit,
-  py3{6,8,9,10,11,12}-bandit,
+  py3{8,9,10,11,12}-unit,
+  py3{8,9,10,11,12}-bandit,
   py3{8,9,10,11,12}-mypy,
-  py311-lintreadme,
-  py311-pydocstyle
+  py312-lintreadme,
+  py312-pydocstyle
 
 skip_missing_interpreters = True
 
@@ -16,7 +16,6 @@ testpaths = tests
 
 [gh-actions]
 python =
-  3.6: py36
   3.8: py38
   3.9: py39
   3.10: py310
@@ -25,64 +24,63 @@ python =
 
 [testenv]
 skipsdist =
-  py3{6,7,8,9,10,11}-!{unit,mypy,lintreadme} = True
+  py3{8,9,10,11,12}-!{unit,mypy,lintreadme} = True
 
 description =
-  py3{6,8,9,10,11,12}-unit: Run the unit tests
-  py3{6,8,9,10,11,12}-lint: Lint the Python code
-  py3{6,8,9,10,11,12}-bandit: Search for common security issues
+  py3{8,9,10,11,12}-unit: Run the unit tests
+  py3{8,9,10,11,12}-lint: Lint the Python code
+  py3{8,9,10,11,12}-bandit: Search for common security issues
   py3{8,9,10,11,12}-mypy: Check for type safety
-  py311-pydocstyle: docstring style checker
-  py311-lintreadme: Lint the README.rst->.md conversion
+  py312-pydocstyle: docstring style checker
+  py312-lintreadme: Lint the README.rst->.md conversion
 
 passenv =
   CI
   GITHUB_*
 
 deps =
-  py3{6,8,9,10,11,12}-{unit,mypy}: -rrequirements.txt
-  py3{6,8,9,10,11,12}-{unit,mypy}: -rtest-requirements.txt
-  py3{6,8,9,10,11,12}-lint: flake8-bugbear
-  py3{6,8,9,10,11,12}-lint: black~=23.1
-  py3{6,8,9,10,11,12}-bandit: bandit
+  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: flake8-bugbear
+  py3{8,9,10,11,12}-lint: black~=23.1
+  py3{8,9,10,11,12}-bandit: bandit
   py3{8,9,10,11,12}-mypy: -rmypy-requirements.txt
 
 setenv =
-  py3{6,8,3,10,11,12}-unit: LC_ALL = C.UTF-8
+  py3{8,3,10,11,12}-unit: LC_ALL = C.UTF-8
   COV_CORE_SOURCE=cwltest
   COV_CORE_CONFIG={toxinidir}/.coveragerc
   COV_CORE_DATAFILE={toxinidir}/.coverage.eager
 
 
 commands =
-  py3{6,8,9,10,11,12}-unit: python -m pip install -U pip setuptools wheel
-  py3{6,8,9,10,11,12}-unit: python -m pytest --cov --cov-config={toxinidir}/.coveragerc --cov-append {posargs}
-  py3{6,8,9,10,11,12}-unit: coverage xml
-  py3{6,8,9,10,11,12}-bandit: bandit --recursive cwltest
-  py3{6,8,9,10,11,12}-lint: make flake8
-  py3{6,8,9,10,11,12}-lint: make format-check
+  py3{8,9,10,11,12}-unit: python -m pip install -U pip setuptools wheel
+  py3{8,9,10,11,12}-unit: python -m pytest --cov --cov-config={toxinidir}/.coveragerc --cov-append {posargs}
+  py3{8,9,10,11,12}-unit: coverage xml
+  py3{8,9,10,11,12}-bandit: bandit --recursive cwltest
+  py3{8,9,10,11,12}-lint: make flake8
+  py3{8,9,10,11,12}-lint: make format-check
   py3{8,9,10,11,12}-mypy: make mypy
-  py38-mypy: make mypy_3.6
 
 allowlist_externals =
-  py3{6,8,9,10,11,12}-lint: flake8
-  py3{6,8,9,10,11,12}-lint: black
-  py3{6,8,9,10,11,12}-{mypy,shellcheck,lint,unit}: make
+  py3{8,9,10,11,12}-lint: flake8
+  py3{8,9,10,11,12}-lint: black
+  py3{8,9,10,11,12}-{mypy,shellcheck,lint,unit}: make
 
 skip_install =
-  py3{6,8,9,10,11,12}-lint: true
-  py3{6,8,9,10,11,12}-bandit: true
+  py3{8,9,10,11,12}-lint: true
+  py3{8,9,10,11,12}-bandit: true
 
 
-[testenv:py311-pydocstyle]
+[testenv:py312-pydocstyle]
 allowlist_externals = make
 commands = make diff_pydocstyle_report
 deps =
     pydocstyle
     diff-cover
 skip_install = true
 
-[testenv:py311-lintreadme]
+[testenv:py312-lintreadme]
 description = Lint the README.rst->.md conversion
 commands =
   python -m build --outdir {distdir}