release-test: include galaxy-tool-util

Author: mr-c

Makefile

@@ -27,7 +27,7 @@ MODULE=cwltool
 PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py
 DEVPKGS=diff_cover black pylint pep257 pydocstyle flake8 tox tox-pyenv \
 	isort wheel autoflake flake8-bugbear pyupgrade bandit \
-	-rtest-requirements.txt -rmypy_requirements.txt
+	-rtest-requirements.txt -rmypy-requirements.txt
 DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
 	   python-flake8 python-mock shellcheck
 

cwltool.Dockerfile

@@ -5,7 +5,7 @@ RUN apk add --no-cache git gcc python3-dev libxml2-dev libxslt-dev libc-dev linu
 WORKDIR /cwltool
 COPY . .
 
-RUN pip install toml -rmypy_requirements.txt "$(grep ruamel requirements.txt)" \
+RUN pip install toml -rmypy-requirements.txt "$(grep ruamel requirements.txt)" \
 	"$(grep schema.salad requirements.txt)"
 # schema-salad is needed to be installed (this time as pure Python) for
 # cwltool + mypyc

mypy_requirements.txt renamed to mypy-requirements.txt

@@ -7,6 +7,7 @@ export LC_ALL=C
 
 package=cwltool
 module=cwltool
+extras="[deps]"
 
 if [ "$GITHUB_ACTIONS" = "true" ]; then
     # We are running as a GH Action
@@ -41,8 +42,7 @@ then
 	rm -f testenv1/lib/python-wheels/setuptools* \
 		&& pip install --force-reinstall -U pip==${pipver} \
 		&& pip install setuptools==${setuptoolsver} wheel
-	pip install -rtest-requirements.txt
-	pip install -e .
+	pip install -rtest-requirements.txt ".${extras}"
 	make test
 	pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
 	mkdir testenv1/not-${module}
@@ -67,7 +67,7 @@ rm -f lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
         && 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}"
+pip install -e "git+${repo}@${HEAD}#egg=${package}${extras}"
 pushd src/${package}
 pip install -rtest-requirements.txt
 make dist
@@ -90,12 +90,14 @@ rm -f lib/python-wheels/setuptools* \
         && pip install setuptools==${setuptoolsver} wheel
 package_tar=$(find . -name "${package}*tar.gz")
 pip install "-r${DIR}/test-requirements.txt"
-pip install "${package_tar}"
+pip install "${package_tar}${extras}"
 mkdir out
 tar --extract --directory=out -z -f ${package}*.tar.gz
 pushd out/${package}*
 make dist
 make test
+pip install "-r${DIR}/mypy-requirements.txt"
+make mypy
 pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
 mkdir ../not-${module}
 pushd ../not-${module}

release-test.sh

@@ -50,7 +50,7 @@ deps =
   py3{6,7,8,9,10}-lint: black
   py3{6,7,8,9,10}-bandit: bandit
   py3{6,7,8,9,10}-bandit: importlib_metadata != 4.8.0
-  py3{6,7,8,9,10}-mypy: -rmypy_requirements.txt
+  py3{6,7,8,9,10}-mypy: -rmypy-requirements.txt
   py39-pydocstyle: pydocstyle
   py39-pydocstyle: diff-cover
   py39-lintreadme: twine