upgrade & fix binary wheel build+publish (#563)

* upgrade RalfG/python-wheels-manylinux-build
* add newer manylinux targets
* switch to setuptools-scm
* release: tag first
* black: ignore autogenerated _version.py
* bandit: our usage of sax is safe

Author: mr-c

.github/workflows/wheel-prep.sh

@@ -1,2 +1,3 @@
 export SCHEMA_SALAD_USE_MYPYC=1
 export MYPYPATH=typeshed
+export SETUPTOOLS_SCM_PRETEND_VERSION=$(grep __version__ schema_salad/_version.py  | awk -F\' '{ print $2 }')

.github/workflows/wheels.yml

@@ -12,18 +12,23 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0  # slow, but gets all the tags
-    - name: Build manylinux2010 Python wheels
-      uses: RalfG/[email protected]_x86_64
+    - name: set version
+      run: pip install setuptools_scm[toml] && python -m setuptools_scm
+    - name: Build manylinux2014 x86 Python wheels
+      uses: RalfG/[email protected]_x86_64
       with:
-        python-versions: 'cp36-cp36m 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/python-wheels-manylinux-build@v0.3.4-manylinux2014_x86_64
+    - name: Build manylinux_2_24 x86 Python wheels
+      uses: RalfG/python-wheels-manylinux-build@v0.4.2-manylinux_2_24_x86_64
       with:
-        python-versions: 'cp36-cp36m 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 manylinux_2_28 x86 Python wheels
+    #   uses: RalfG/[email protected]_2_28_x86_64
+    #   with:
+    #     pre-build-command: source .github/workflows/wheel-prep.sh
+    #     build-requirements: -rrequirements.txt -rmypy-requirements.txt
     - name: Move audited wheels to new directory
       run: mkdir audited_wheels && cp dist/*-manylinux*.whl audited_wheels/
     - name: Publish wheels to PyPI
@@ -41,12 +46,23 @@ jobs:
         fetch-depth: 0  # slow, but gets all the tags
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2
-    - name: Build manylinux2014 Python wheels
-      uses: RalfG/[email protected]_aarch64
+    - name: set version
+      run: pip install setuptools_scm[toml] && python -m setuptools_scm
+    - name: Build manylinux2014 aarch64 Python wheels
+      uses: RalfG/[email protected]_aarch64
       with:
-        python-versions: 'cp36-cp36m 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 manylinux2_24 aarch64 Python wheels
+    #   uses: RalfG/[email protected]_24_aarch64
+    #   with:
+    #     pre-build-command: source .github/workflows/wheel-prep.sh
+    #     build-requirements: -rrequirements.txt -rmypy-requirements.txt
+    # - name: Build manylinux2_28 aarch64 Python wheels
+    #   uses: RalfG/[email protected]_28_aarch64
+    #   with:
+    #     pre-build-command: source .github/workflows/wheel-prep.sh
+    #     build-requirements: -rrequirements.txt -rmypy-requirements.txt
     - name: Move audited wheels to new directory
       run: mkdir audited_wheels && cp dist/*-manylinux*.whl audited_wheels/
     - name: Publish wheels to PyPI

MANIFEST.in

@@ -1,4 +1,4 @@
-include gittaggers.py Makefile LICENSE.txt requirements.txt mypy-requirements.txt test-requirements.txt mypy.ini
+include Makefile LICENSE.txt requirements.txt mypy-requirements.txt test-requirements.txt mypy.ini
 include schema_salad/py.typed
 include schema_salad/avro/*
 recursive-include schema_salad/java *

Makefile

@@ -98,10 +98,10 @@ diff_pydocstyle_report: pydocstyle_report.txt
 
 ## format      : check/fix all code indentation and formatting (runs black)
 format:
-	black --exclude metaschema.py schema_salad setup.py typeshed
+	black --exclude metaschema.py --exclude _version.py schema_salad setup.py typeshed
 
 format-check:
-	black --diff --check --exclude metaschema.py schema_salad setup.py typeshed
+	black --diff --check --exclude metaschema.py --exclude _version.py schema_salad setup.py typeshed
 
 ## pylint      : run static code analysis on Python code
 pylint: $(PYSOURCES)
@@ -188,12 +188,13 @@ release-test: FORCE
 	./release-test.sh
 
 release: release-test
+	git tag ${VERSION}
 	. testenv2/bin/activate && \
 		python testenv2/src/${PACKAGE}/setup.py sdist bdist_wheel
 	. testenv2/bin/activate && \
 		pip install twine && \
 		twine upload testenv2/src/${PACKAGE}/dist/* && \
-		git tag ${VERSION} && git push --tags
+		git push --tags
 
 flake8: $(PYSOURCES)
 	flake8 $^

docs/conf.py

@@ -13,7 +13,7 @@
 import os
 import sys
 
-from pkg_resources import get_distribution
+from importlib.metadata import version
 
 sys.path.insert(0, os.path.abspath('..'))
 
@@ -62,7 +62,7 @@
 html_static_path = ['_static']
 
 
-release = get_distribution('schema-salad').version
+release = version('schema-salad')
 version = '.'.join(release.split('.')[:2])
 
 autoapi_dirs = ['../schema_salad']

gittaggers.py

@@ -0,0 +1,2 @@
+[tool.setuptools_scm]
+write_to = "schema_salad/_version.py"

pyproject.toml

@@ -13,10 +13,9 @@
 )
 from urllib.parse import urlsplit
 
-from .dotnet_codegen import DotNetCodeGen
-
 from . import schema
 from .codegen_base import CodeGenBase
+from .dotnet_codegen import DotNetCodeGen
 from .exceptions import SchemaSaladException
 from .java_codegen import JavaCodeGen
 from .python_codegen import PythonCodeGen

schema_salad/codegen.py

@@ -14,9 +14,9 @@
     Set,
     Union,
 )
+from xml.sax.saxutils import escape  # nosec
 
 import pkg_resources
-from xml.sax.saxutils import escape
 
 from . import _logger, schema
 from .codegen_base import CodeGenBase, TypeDef

schema_salad/dotnet_codegen.py

@@ -34,7 +34,7 @@
 )
 
 from . import _logger, jsonld_context, ref_resolver, validate
-from .avro.schema import Names, SchemaParseException, make_avsc_object, is_subtype
+from .avro.schema import Names, SchemaParseException, is_subtype, make_avsc_object
 from .exceptions import (
     ClassValidationException,
     SchemaSaladException,