feature: generate coverage reports with make

Also makes setuptools install cov-pytest,
right now coverage is only generated by unit tests

Author: psafont

Makefile

@@ -113,23 +113,10 @@ pylint_report.txt: ${PYSOURCES}
 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: tests
 
-coverage.xml: .coverage
-	python-coverage xml
-
-coverage.html: htmlcov/index.html
-
-htmlcov/index.html: .coverage
-	python-coverage html
-	@echo Test coverage of the Python code is now in htmlcov/index.html
-
-coverage-report: .coverage
-	python-coverage report
+coverage: .coverage
+	coverage report
 
 diff-cover: coverage-gcovr.xml coverage.xml
 	diff-cover coverage-gcovr.xml coverage.xml
@@ -139,8 +126,8 @@ diff-cover.html: coverage-gcovr.xml coverage.xml
 		--html-report diff-cover.html
 
 ## test        : run the ${MODULE} test suite
-test: FORCE
-	./setup.py test
+test: $(PYSOURCES)
+	python setup.py test --addopts "--cov-report html --cov-report xml --cov cwltool"
 
 sloccount.sc: ${PYSOURCES} Makefile
 	sloccount --duplicates --wide --details $^ > sloccount.sc

setup.py

@@ -16,7 +16,7 @@
     tagger = egg_info_cmd.egg_info
 
 needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
-pytest_runner = ['pytest-runner'] if needs_pytest else []
+pytest_runner = ['pytest-runner', 'pytest-cov'] if needs_pytest else []
 
 setup(name='cwltool',
       version='1.0',

tox.ini

@@ -20,7 +20,6 @@ skip_missing_interpreters = True
 passenv = CI TRAVIS TRAVIS_*
 deps =
   -rrequirements.txt
-  py{27,34,35,36}-unit: pytest-cov
   py{27,34,35,36}-unit: codecov
   py{27,34,35,36}-unit: coveralls
   py{27,34,35,36}-lint: flake8