update release test

Author: mr-c

Makefile

@@ -139,12 +139,12 @@ diff-cover.html: coverage.xml
 	diff-cover $^ --html-report $@
 
 ## test        : run the ${MODULE} test suite
-test: FORCE
-	python setup.py test # --addopts "-n auto --dist=loadfile"
+test: dev
+	pytest # --addopts "-n auto --dist=loadfile"
 
 ## testcov     : run the ${MODULE} test suite and collect coverage
 testcov: $(pysources)
-	python setup.py test --addopts "--cov ${MODULE}" # -n auto --dist=loadfile"
+	pytest --cov ${MODULE} # -n auto --dist=loadfile"
 
 sloccount.sc: ${PYSOURCES} Makefile
 	sloccount --duplicates --wide --details $^ > $@

release-test.sh

@@ -19,42 +19,41 @@ fi
 run_tests="bin/py.test --pyargs ${module}"
 pipver=20.3b1 # minimum required version of pip for Python 3.9
 setuptoolsver=41.1.0 # required for Python 3.9
-PYVER=${PYVER:=3}
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+rm -Rf testenv? || /bin/true
 
-rm -Rf "testenv${PYVER}_"? || /bin/true
 
 if [ "${RELEASE_SKIP}" != "head" ]
 then
-	"python${PYVER}" -m venv "testenv${PYVER}_1"
+	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==${setuptoolsver} wheel
-	pip install pytest\<7 pytest-xdist -rrequirements.txt
+	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
+	pip install -rtest-requirements.txt
 	make test
-	pip uninstall -y ${package} || true; pip uninstall -y ${package} \
-		|| true; make install
-	mkdir "testenv${PYVER}_1/not-${module}"
+	pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
+	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
 
-
-"python${PYVER}" -m venv "testenv${PYVER}_2"
-"python${PYVER}" -m venv "testenv${PYVER}_3"
-"python${PYVER}" -m venv "testenv${PYVER}_4"
-"python${PYVER}" -m venv "testenv${PYVER}_5"
-
+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 -f lib/python-wheels/setuptools* \
@@ -63,28 +62,29 @@ rm -f lib/python-wheels/setuptools* \
 # The following can fail if you haven't pushed your commits to ${repo}
 pip install -e "git+${repo}@${HEAD}#egg=${package}"
 pushd src/${package}
-pip install pytest\<7 pytest-xdist
+pip install -rtest-requirements.txt
 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 -f lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
         && pip install setuptools==${setuptoolsver} wheel
-pip install ${package}*tar.gz
-pip install pytest\<7 pytest-xdist
+package_tar=$(find . -name "${package}*tar.gz")
+pip install "-r${DIR}/test-requirements.txt"
+pip install "${package_tar}"
 mkdir out
 tar --extract --directory=out -z -f ${package}*.tar.gz
 pushd out/${package}*
@@ -98,16 +98,16 @@ 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 -f lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
         && pip install setuptools==${setuptoolsver} wheel
 pip install ${module}*.whl
-pip install pytest\<7 pytest-xdist
+pip install "-r${DIR}/test-requirements.txt"
 mkdir not-${module}
 pushd not-${module}
 # shellcheck disable=SC2086

requirements.txt

@@ -1,4 +1,3 @@
-ruamel.yaml>=0.12.4,<0.17.10
 requests
 schema-salad >= 7, < 8
 typing_extensions

setup.py

@@ -18,7 +18,6 @@
     include_package_data=True,
     python_requires=">=3.6",
     install_requires=[
-        "ruamel.yaml>=0.12.4,<0.17.10",
         "requests",
         "schema-salad >= 7, < 8",
         "typing_extensions",

test-requirements.txt

@@ -1,2 +1,3 @@
 pytest < 7
 pytest-cov
+pytest-xdist