update release script for Python3.9 compat

Author: mr-c

Makefile

@@ -60,12 +60,12 @@ install: FORCE
 dist: dist/${MODULE}-$(VERSION).tar.gz
 
 dist/${MODULE}-$(VERSION).tar.gz: $(SOURCES)
-	./setup.py sdist bdist_wheel
+	python setup.py sdist bdist_wheel
 
 ## clean       : clean up all temporary / machine-generated files
 clean: FORCE
 	rm -f ${MODILE}/*.pyc tests/*.pyc
-	./setup.py clean --all || true
+	python setup.py clean --all || true
 	rm -Rf .coverage
 	rm -f diff-cover.html
 
@@ -125,7 +125,7 @@ diff-cover.html: coverage-gcovr.xml coverage.xml
 
 ## test        : run the ${MODULE} test suite
 test: all
-	./setup.py test
+	python setup.py test
 
 sloccount.sc: ${PYSOURCES} Makefile
 	sloccount --duplicates --wide --details $^ > $@

release-test.sh

@@ -3,79 +3,79 @@
 set -e
 set -x
 
+export LC_ALL=C
+
 package=cwltest
 module=cwltest
 slug=${TRAVIS_PULL_REQUEST_SLUG:=common-workflow-language/${module}}
 repo=https://github.com/${slug}.git
 run_tests="bin/py.test --pyargs ${module}"
-pipver=18 # minimum required version of pip
-setupver=40.3 # minimum required version of setuptools
-PYVER=${PYVER:=3}
+pipver=20.3b1 # minimum required version of pip for Python 3.9
+setuptoolsver=41.1.0 # required for Python 3.9
 
 rm -Rf "testenv${PYVER}_"? || /bin/true
 
 export HEAD=${TRAVIS_PULL_REQUEST_SHA:-$(git rev-parse HEAD)}
 
 if [ "${RELEASE_SKIP}" != "head" ]
 then
-	virtualenv "testenv${PYVER}_1" -p "python${PYVER}"
+	python3 -m venv testenv1
 	# First we test the head
 	# shellcheck source=/dev/null
-	source "testenv${PYVER}_1/bin/activate"
-	rm -f "testenv${PYVER}_1/lib/python-wheels/setuptools"*
-	pip install --force-reinstall -U pip==${pipver}
-	pip install setuptools==${setupver} wheel
+	source testenv1/bin/activate
+	rm -Rf testenv1/local
+	rm -f testenv1/lib/python-wheels/setuptools* \
+		&& pip install --force-reinstall -U pip==${pipver} \
+		&& pip install setuptools==${setuptoolsver} wheel
 	make install-dependencies
 	make test
 	pip uninstall -y ${package} || true; pip uninstall -y ${package} \
 		|| true; make install
-	mkdir "testenv${PYVER}_1/not-${module}"
+	mkdir testenv1/not-${module}
 	# if there is a subdir named '${module}' py.test will execute tests
 	# there instead of the installed module's tests
-
-	pushd "testenv${PYVER}_1/not-${module}"
+	pushd testenv1/not-${module}
 	# shellcheck disable=SC2086
 	../${run_tests}; popd
 fi
 
-
-virtualenv "testenv${PYVER}_2" -p "python${PYVER}"
-virtualenv "testenv${PYVER}_3" -p "python${PYVER}"
-virtualenv "testenv${PYVER}_4" -p "python${PYVER}"
-virtualenv "testenv${PYVER}_5" -p "python${PYVER}"
-
+python3 -m venv testenv2
+python3 -m venv testenv3
+python3 -m venv testenv4
+python3 -m venv testenv5
+rm -Rf testenv[2345]/local
 
 # Secondly we test via pip
 
-pushd "testenv${PYVER}_2"
+pushd testenv2
 # shellcheck source=/dev/null
 source bin/activate
-rm lib/python-wheels/setuptools* \
+rm -f lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
-        && pip install setuptools==${setupver} wheel
+        && pip install setuptools==${setuptoolsver} wheel
 # The following can fail if you haven't pushed your commits to ${repo}
 pip install -e "git+${repo}@${HEAD}#egg=${package}"
 pushd src/${package}
 make install-dependencies
 make dist
 make test
-cp dist/${package}*tar.gz "../../../testenv${PYVER}_3/"
-cp dist/${module}*whl "../../../testenv${PYVER}_4/"
+cp dist/${package}*tar.gz ../../../testenv3/
+cp dist/${module}*whl ../../../testenv4/
 pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
 popd # ../.. no subdir named ${proj} here, safe for py.testing the installed module
 # shellcheck disable=SC2086
 ${run_tests}
 popd
 
-# Is the source distribution in testenv${PYVER}_2 complete enough to build
+# Is the source distribution in testenv2 complete enough to build
 # another functional distribution?
 
-pushd "testenv${PYVER}_3/"
+pushd testenv3/
 # shellcheck source=/dev/null
 source bin/activate
-rm lib/python-wheels/setuptools* \
+rm -f lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
-        && pip install setuptools==${setupver} wheel
+        && pip install setuptools==${setuptoolsver} wheel
 pip install ${package}*tar.gz
 pip install pytest\<5
 mkdir out
@@ -91,14 +91,14 @@ pushd ../not-${module}
 popd
 popd
 
-# Is the wheel in testenv${PYVER}_2 installable and will it pass the tests
+# Is the wheel in testenv2 installable and will it pass the tests
 
-pushd "testenv${PYVER}_4/"
+pushd testenv4/
 # shellcheck source=/dev/null
 source bin/activate
-rm lib/python-wheels/setuptools* \
+rm -f lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
-        && pip install setuptools==${setupver} wheel
+        && pip install setuptools==${setuptoolsver} wheel
 pip install ${module}*.whl
 pip install pytest\<5
 mkdir not-${module}