update the test execution and ship the tests

Author: mr-c

MANIFEST.in

@@ -1,3 +1,5 @@
 include Makefile
 global-exclude *~
 global-exclude *.pyc
+include tests/*
+include tests/test-data/*

Makefile

@@ -26,15 +26,15 @@ MODULE=cwltest
 # `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=pep8 diff_cover autopep8 pylint coverage pep257 flake8
+DEVPKGS=pep8 diff_cover autopep8 pylint coverage pep257 flake8 pytest
 DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pep257 sloccount python-flake8
 VERSION=1.0.$(shell date +%Y%m%d%H%M%S --date=`git log --first-parent \
 	--max-count=1 --format=format:%cI`)
 mkfile_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 ## all         : default task
 all:
-	./setup.py develop
+	pip install -e .
 
 ## help        : print this help message and exit
 help: Makefile
@@ -109,10 +109,7 @@ diff_pylint_report: pylint_report.txt
 	diff-quality --violations=pylint pylint_report.txt
 
 .coverage: $(PYSOURCES) all
-	export COVERAGE_PROCESS_START=${mkfile_dir}.coveragerc; \
-	       cd ${CWL}; ./run_test.sh RUNNER=cwltool
-	coverage run setup.py test
-	coverage combine ${CWL} ${CWL}/draft-3/ ./
+	coverage run ./setup.py test
 
 coverage.xml: .coverage
 	python-coverage xml
@@ -135,6 +132,7 @@ diff-cover.html: coverage-gcovr.xml coverage.xml
 
 ## test        : run the ${MODULE} test suite
 test: FORCE
+	./setup.py test
 
 sloccount.sc: ${PYSOURCES} Makefile
 	sloccount --duplicates --wide --details $^ > sloccount.sc

release-test.sh

@@ -6,7 +6,7 @@ set -x
 package=cwltest
 module=cwltest
 repo=https://github.com/common-workflow-language/cwltest.git
-run_tests="cwltest --help"
+run_tests="py.test --pyarg ${module}"
 pipver=8.0.1 # minimum required version of pip
 setupver=20.10.1 # minimum required version of setuptools
 

setup.cfg

@@ -5,3 +5,6 @@ ignore = E124,E128,E129,E201,E202,E225,E226,E231,E265,E271,E302,E303,F401,E402,E
 
 [bdist_wheel]
 universal = 1
+
+[tool:pytest]
+testpaths = tests

setup.py

@@ -22,6 +22,9 @@
     'six>=1.10.0'
 ]
 
+needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
+pytest_runner = ['pytest-runner'] if needs_pytest else []
+
 if sys.version_info.major == 2:
     install_requires.extend(['futures >= 3.0.5', 'subprocess32'])
 
@@ -37,10 +40,13 @@
       url="https://github.com/common-workflow-language/cwltest",
       download_url="https://github.com/common-workflow-language/cwltest",
       license='Apache 2.0',
-      packages=["cwltest"],
+      packages=["cwltest", "cwltest.tests"],
+      package_dir={'cwltest.tests': 'tests'},
+      include_package_data=True,
       install_requires=install_requires,
       test_suite='tests',
-      tests_require=[],
+      setup_requires=[] + pytest_runner,
+      tests_require=['pytest'],
       entry_points={
           'console_scripts': ["cwltest=cwltest:main"]
       },