drop support for Python 3.6

Author: mr-c

.github/workflows/ci-tests.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         py-ver-major: [3]
-        py-ver-minor: [6, 7, 8, 9, 10]
+        py-ver-minor: [7, 8, 9, 10]
         step: [lint, unit, mypy]
 
     env:

.github/workflows/wheels.yml

@@ -12,13 +12,13 @@ jobs:
     - name: Build manylinux2010 Python wheels
       uses: RalfG/[email protected]_x86_64
       with:
-        python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
         pre-build-command: source .github/workflows/wheel-prep.sh
         build-requirements: -rrequirements.txt -rmypy-requirements.txt
     - name: Build manylinux2014 Python wheels
       uses: RalfG/[email protected]_x86_64
       with:
-        python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
         pre-build-command: source .github/workflows/wheel-prep.sh
         build-requirements: -rrequirements.txt -rmypy-requirements.txt
     - name: Move audited wheels to new directory
@@ -39,7 +39,7 @@ jobs:
     - name: Build manylinux2014 Python wheels
       uses: RalfG/[email protected]_aarch64
       with:
-        python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
         pre-build-command: source .github/workflows/wheel-prep.sh
         build-requirements: -rrequirements.txt -rmypy-requirements.txt
     - name: Move audited wheels to new directory

CONTRIBUTING.md

@@ -1,5 +1,5 @@
 Style guide:
-- Python 3.6+ compatible code
+- Python 3.7+ compatible code
 - PEP-484 type hints
 - Prefer new style format strings https://pyformat.info/
 - Use ``make format`` to format your code

Makefile

@@ -181,7 +181,7 @@ mypyc: $(PYSOURCES)
 	MYPYPATH=typeshed SCHEMA_SALAD_USE_MYPYC=1 python setup.py test
 
 pyupgrade: $(filter-out schema_salad/metaschema.py,$(PYSOURCES))
-	pyupgrade --exit-zero-even-if-changed --py36-plus $^
+	pyupgrade --exit-zero-even-if-changed --py37-plus $^
 
 release-test: FORCE
 	git diff-index --quiet HEAD -- || ( echo You have uncommited changes, please commit them and try again; false )

schema_salad/codegen_base.py

@@ -1,44 +1,19 @@
 """Base class for the generation of loaders from schema-salad definitions."""
 from collections import OrderedDict
-from typing import Any, Dict, List, MutableSequence, Optional, Set, Union
+from typing import Any, Dict, List, MutableSequence, NamedTuple, Optional, Set, Union
 
 
-class TypeDef:  # pylint: disable=too-few-public-methods
+class TypeDef(NamedTuple):
     """Schema Salad type description."""
 
-    __slots__ = [
-        "name",
-        "init",
-        "is_uri",
-        "scoped_id",
-        "ref_scope",
-        "loader_type",
-        "instance_type",
-        "abstract",
-    ]
-
-    # switch to class-style typing.NamedTuple once support for Python < 3.6
-    # is dropped
-    def __init__(
-        self,  # pylint: disable=too-many-arguments
-        name: str,
-        init: str,
-        is_uri: bool = False,
-        scoped_id: bool = False,
-        ref_scope: Optional[int] = 0,
-        loader_type: Optional[str] = None,
-        instance_type: Optional[str] = None,
-        abstract: bool = False,
-    ) -> None:
-        self.name = name
-        self.init = init
-        self.is_uri = is_uri
-        self.scoped_id = scoped_id
-        self.ref_scope = ref_scope
-        self.abstract = abstract
-        # Follow attributes used by Java but not Python.
-        self.loader_type = loader_type
-        self.instance_type = instance_type
+    name: str
+    init: str
+    is_uri: bool = False
+    scoped_id: bool = False
+    ref_scope: Optional[int] = 0
+    loader_type: Optional[str] = None
+    instance_type: Optional[str] = None
+    abstract: bool = False
 
 
 class CodeGenBase:

schema_salad/typescript_codegen.py

@@ -451,7 +451,7 @@ def type_loader_enum(self, type_declaration: Dict[str, Any]) -> TypeDef:
             for sym in type_declaration["symbols"]:
                 val = self.safe_name(sym)
                 const = self.safe_name(sym).replace("-", "_").replace(".", "_").upper()
-                f.write("""  {const}='{val}',\n""".format(const=const, val=val))
+                f.write(f"""  {const}='{val}',\n""")
             f.write(
                 """}
 """
@@ -768,7 +768,7 @@ def expand_resource_template_to(resource: str, path: Path) -> None:
                 )
 
         internal_module_exports = "\n".join(
-            "export * from '../{}'".format(f) for f in self.modules
+            f"export * from '../{f}'" for f in self.modules
         )
 
         example_tests = ""

setup.py

@@ -102,7 +102,7 @@
     download_url="https://github.com/common-workflow-language/schema_salad/releases",
     ext_modules=ext_modules,
     license="Apache 2.0",
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     setup_requires=pytest_runner,
     packages=["schema_salad", "schema_salad.tests"],
     package_data={"schema_salad": ["metaschema/*", "py.typed"]},
@@ -126,7 +126,6 @@
         "Operating System :: POSIX",
         "Operating System :: MacOS :: MacOS X",
         "Development Status :: 5 - Production/Stable",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",

tox.ini

@@ -1,9 +1,9 @@
 [tox]
 envlist =
-  py{36,37,38,39,310}-lint,
-  py{36,37,38,39,310}-unit,
-  py{36,37,38,39,310}-bandit,
-  py{36,37,38,39,310}-mypy,
+  py{37,38,39,310}-lint,
+  py{37,38,39,310}-unit,
+  py{37,38,39,310}-bandit,
+  py{37,38,39,310}-mypy,
   py39-lintreadme,
   py39-pydocstyle
 
@@ -15,55 +15,54 @@ testpaths=schema_salad/tests
 
 [gh-actions]
 python =
-  3.6: py36
   3.7: py37
   3.8: py38
   3.9: py39
   3.10: py310
 
 [testenv]
 description =
-  py{36,37,38,39,310}-unit: Run the unit tests
-  py{36,37,38,39,310}-lint: Lint the Python code
-  py{36,37,38,39,310}-bandit: Search for common security issues
-  py{36,37,38,39,310}-mypy: Check for type safety
+  py{37,38,39,310}-unit: Run the unit tests
+  py{37,38,39,310}-lint: Lint the Python code
+  py{37,38,39,310}-bandit: Search for common security issues
+  py{37,38,39,310}-mypy: Check for type safety
   py39-pydocstyle: docstring style checker
   py39-lintreadme: Lint the README.rst->.md conversion
 
 passenv =
   CI
   GITHUB_*
 deps =
-  py{36,37,38,39,310}-{unit,mypy}: -rrequirements.txt
-  py{36,37,38,39,310}-{unit,mypy}: -rtest-requirements.txt
-  py{36,37,38,39,310}-lint: flake8-bugbear
-  py{36,37,38,39,310}-lint: black
-  py{36,37,38,39,310}-bandit: bandit
-  py{36,37,38,39,310}-mypy: -rmypy-requirements.txt
+  py{37,38,39,310}-{unit,mypy}: -rrequirements.txt
+  py{37,38,39,310}-{unit,mypy}: -rtest-requirements.txt
+  py{37,38,39,310}-lint: flake8-bugbear
+  py{37,38,39,310}-lint: black
+  py{37,38,39,310}-bandit: bandit
+  py{37,38,39,310}-mypy: -rmypy-requirements.txt
 
 setenv =
-  py{36,37,38,39,310}-unit: LC_ALL = C.UTF-8
+  py{37,38,39,310}-unit: LC_ALL = C.UTF-8
 
 commands =
-  py{36,37,38,39,310}-unit: python -m pip install -U pip setuptools wheel
-  py{36,37,38,39,310}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
-  py{36,37,38,39,310}-bandit: bandit --recursive --exclude schema_salad/tests/ schema_salad
-  py{36,37,38,39,310}-lint: make flake8
-  py{36,37,38,39,310}-lint: make format-check
-  py{36,37,38,39,310}-mypy: make mypy
-  py{36,37,38,39,310}-mypy: make mypyc
+  py{37,38,39,310}-unit: python -m pip install -U pip setuptools wheel
+  py{37,38,39,310}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
+  py{37,38,39,310}-bandit: bandit --recursive --exclude schema_salad/tests/ schema_salad
+  py{37,38,39,310}-lint: make flake8
+  py{37,38,39,310}-lint: make format-check
+  py{37,38,39,310}-mypy: make mypy
+  py{37,38,39,310}-mypy: make mypyc
 
 whitelist_externals =
-  py{36,37,38,39,310}-lint: flake8
-  py{36,37,38,39,310}-lint: black
-  py{36,37,38,39,310}-{mypy,shellcheck,lint,unit}: make
+  py{37,38,39,310}-lint: flake8
+  py{37,38,39,310}-lint: black
+  py{37,38,39,310}-{mypy,shellcheck,lint,unit}: make
 
 skip_install =
-  py{36,37,38,39,310}-lint: true
-  py{36,37,38,39,310}-bandit: true
+  py{37,38,39,310}-lint: true
+  py{37,38,39,310}-bandit: true
 
 extras =
-  py{36,37,38,39,310}-unit: pycodegen
+  py{37,38,39,310}-unit: pycodegen
 
 [testenv:py39-pydocstyle]
 whitelist_externals = make