Fix docker image name (#852)

Author: mr-c

MANIFEST.in

@@ -1,4 +1,5 @@
 include MANIFEST.in
+include *requirements.txt
 include gittaggers.py Makefile cwltool.py
 include tests/*
 include tests/tmp1/tmp2/tmp3/.gitkeep

Makefile

@@ -26,7 +26,8 @@ MODULE=cwltool
 # `SHELL=bash` doesn't work for some, so don't use BASH-isms like
 # `[[` conditional expressions.
 PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py
-DEVPKGS=pycodestyle diff_cover autopep8 pylint coverage pydocstyle flake8 pytest isort 
+DEVPKGS=pycodestyle diff_cover autopep8 pylint coverage pydocstyle flake8 \
+	pytest pytest-xdist isort
 DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
 	   python-flake8 python-mock shellcheck
 VERSION=1.0.$(shell date +%Y%m%d%H%M%S --utc --date=`git log --first-parent \
@@ -142,11 +143,11 @@ diff-cover.html:  coverage.xml
 
 ## test        : run the ${MODULE} test suite
 test: $(pysources)
-	python setup.py test
+	python setup.py test --addopts "-n$(nproc) --dist=loadfile"
 
 ## testcov     : run the ${MODULE} test suite and collect coverage
 testcov: $(pysources)
-	python setup.py test --addopts "--cov cwltool"
+	python setup.py test --addopts "--cov cwltool -n$(nproc) --dist=loadfile"
 
 sloccount.sc: ${PYSOURCES} Makefile
 	sloccount --duplicates --wide --details $^ > sloccount.sc

build-cwl-docker.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 set -e
-docker build --file=cwltool.Dockerfile --tag=commonworkflowlanguage/cwltool-module --target module .
+docker build --file=cwltool.Dockerfile --tag=commonworkflowlanguage/cwltool_module --target module .
 docker build --file=cwltool.Dockerfile --tag=commonworkflowlanguage/cwltool .
 
 version=$(git describe --tags)
 echo $version | grep -vq '\-' >& /dev/null
 if [ $? -eq 0 ];then
-    docker tag commonworkflowlanguage/cwltool-module commonworkflowlanguage/cwltool-module:$version
+    docker tag commonworkflowlanguage/cwltool_module commonworkflowlanguage/cwltool_module:$version
     docker tag commonworkflowlanguage/cwltool commonworkflowlanguage/cwltool:$version
 fi

release-test.sh

@@ -3,11 +3,13 @@
 set -e
 set -x
 
+export LC_ALL=C
+
 package=cwltool
 module=cwltool
 slug=${TRAVIS_PULL_REQUEST_SLUG:=common-workflow-language/cwltool}
 repo=https://github.com/${slug}.git
-run_tests="bin/py.test --ignore ${module}/schemas/ --pyarg cwltool"
+run_tests="bin/py.test --ignore ${module}/schemas/ --pyarg cwltool -n$(nproc) --dist=loadfile"
 pipver=7.0.2 # minimum required version of pip
 setuptoolsver=24.2.0 # required to generate correct metadata for
                      # python_requires
@@ -71,10 +73,11 @@ rm lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
         && pip install setuptools==${setuptoolsver} wheel
 pip install ${package}*tar.gz
-pip install -r${DIR}/test-requirements.txt
+pip install "-r${DIR}/test-requirements.txt"
 mkdir out
 tar --extract --directory=out -z -f ${package}*.tar.gz
 cd out/${package}*
+make install-dep
 make dist
 make test
 pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install