Merge pull request #384 from common-workflow-language/parallel-cov

parallel test coverage

Author: mergify[bot]

.coveragerc

@@ -1,6 +1,7 @@
 [run]
 branch = True
 source = schema_salad
+omit = schema_salad/tests/*
 
 [report]
 exclude_lines =

Makefile

@@ -26,20 +26,18 @@ PACKAGE=schema-salad
 # `SHELL=bash` doesn't work for some, so don't use BASH-isms like
 # `[[` conditional expressions.
 PYSOURCES=$(wildcard ${MODULE}/**.py ${MODULE}/avro/*.py ${MODULE}/tests/*.py) setup.py
-DEVPKGS=diff_cover black pylint coverage pep257 pydocstyle flake8 tox\
+DEVPKGS=diff_cover black pylint pep257 pydocstyle flake8 tox tox-pyenv \
 	isort wheel autoflake flake8-bugbear pyupgrade bandit \
 	-rtest-requirements.txt -rmypy_requirements.txt
-COVBASE=coverage run --branch --append --source=${MODULE} \
-	--omit=schema_salad/tests/*
+COVBASE=coverage run --append
 
 # Updating the Major & Minor version below?
 # Don't forget to update setup.py as well
 VERSION=7.1.$(shell date +%Y%m%d%H%M%S --utc --date=`git log --first-parent \
 	--max-count=1 --format=format:%cI`)
 
 ## all         : default task
-all:
-	pip install -e .
+all: dev
 
 ## help        : print this help message and exit
 help: Makefile
@@ -48,7 +46,7 @@ help: Makefile
 ## install-dep : install most of the development dependencies via pip
 install-dep: install-dependencies
 
-install-dependencies:
+install-dependencies: FORCE
 	pip install --upgrade $(DEVPKGS)
 	pip install -r requirements.txt
 
@@ -58,7 +56,7 @@ install: FORCE
 
 ## dev     : install the ${MODULE} module in dev mode
 dev: install-dep
-	pip install -e
+	pip install -e .
 
 ## dist        : create a module package for distribution
 dist: dist/${MODULE}-$(VERSION).tar.gz
@@ -108,16 +106,15 @@ pylint: $(PYSOURCES)
 	pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
                 $^ -j0|| true
 
-pylint_report.txt: ${PYSOURCES}
+pylint_report.txt: $(PYSOURCES)
 	pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
 		$^ -j0> $@ || true
 
 diff_pylint_report: pylint_report.txt
 	diff-quality --violations=pylint pylint_report.txt
 
-.coverage: $(PYSOURCES) all
-	rm -f .coverage
-	$(COVBASE) setup.py test
+.coverage: testcov
+	python setup.py test --addopts "--cov --cov-config=.coveragerc --cov-report= -n auto"
 	$(COVBASE) -m schema_salad.main \
 		--print-jsonld-context schema_salad/metaschema/metaschema.yml \
 		> /dev/null
@@ -162,34 +159,38 @@ diff-cover.html: coverage.xml
 	diff-cover $^ --html-report $@
 
 ## test        : run the ${MODULE} test suite
-test: FORCE
-	python setup.py test --addopts "-n auto"
+test: $(PYSOURCES)
+	python setup.py test
+
+## testcov     : run the ${MODULE} test suite and collect coverage
+testcov: $(PYSOURCES)
+	python setup.py test --addopts "--cov"
 
-sloccount.sc: ${PYSOURCES} Makefile
+sloccount.sc: $(PYSOURCES) Makefile
 	sloccount --duplicates --wide --details $^ > $@
 
 ## sloccount   : count lines of code
-sloccount: ${PYSOURCES} Makefile
+sloccount: $(PYSOURCES) Makefile
 	sloccount $^
 
 list-author-emails:
 	@echo 'name, E-Mail Address'
 	@git log --format='%aN,%aE' | sort -u | grep -v 'root'
 
 mypy3: mypy
-mypy: ${PYSOURCES}
+mypy: $(filter-out setup.py gittagger.py,$(PYSOURCES))
 	if ! test -f $(shell python3 -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))')/py.typed ; \
 	then \
 		rm -Rf typeshed/ruamel/yaml ; \
 		ln -s $(shell python3 -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
 			typeshed/ruamel/ ; \
 	fi  # if minimally required ruamel.yaml version is 0.15.99 or greater, than the above can be removed
-	MYPYPATH=$$MYPYPATH:typeshed mypy schema_salad
+	MYPYPATH=$$MYPYPATH:typeshed mypy $^
 
-mypyc: ${PYSOURCES}
+mypyc: $(PYSOURCES)
 	MYPYPATH=typeshed SCHEMA_SALAD_USE_MYPYC=1 python setup.py test
 
-pyupgrade: $(filter-out schema_salad/metaschema.py,${PYSOURCES})
+pyupgrade: $(filter-out schema_salad/metaschema.py,$(PYSOURCES))
 	pyupgrade --exit-zero-even-if-changed --py36-plus $^
 
 release-test: FORCE
@@ -204,7 +205,7 @@ release: release-test
 		twine upload testenv2/src/${PACKAGE}/dist/* && \
 		git tag ${VERSION} && git push --tags
 
-flake8: ${PYSOURCES}
+flake8: $(PYSOURCES)
 	flake8 $^
 
 FORCE:

appveyor.yml

@@ -1,4 +1,5 @@
 version: .{build}-{branch}
+image: Visual Studio 2019
 
 cache:
  - '%LOCALAPPDATA%\pip\Cache'
@@ -20,20 +21,22 @@ environment:
       PYTHON_VERSION: "3.8.x"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python39-x64"
+      PYTHON_VERSION: "3.9.x"
+      PYTHON_ARCH: "64"
+
 install:
   - "set PATH=%PYTHON%\\Scripts;%PATH%"
   - "%PYTHON%\\python.exe -m pip install -U pip setuptools^>=20.3 wheel"
-  - "%PYTHON%\\python.exe -m pip install -U pytest^<7 codecov pytest-xdist pytest-cov galaxy-lib"
-    # Note the use of a `^` to escape the `>`
+  - "%PYTHON%\\python.exe -m pip install -U -rtest-requirements.txt codecov"
+  - "%PYTHON%\\python.exe -m pip install -rrequirements.txt"
 
 build_script:
-  - "%PYTHON%\\python.exe -m pip install -rrequirements.txt"
   - "%PYTHON%\\python.exe -m pip install -e ."
 
 test_script:
   - |
-    %PYTHON%\\python.exe -m coverage run --parallel-mode -m pytest --strict -p no:cacheprovider -p no:stepwise --junit-xml=tests.xml
-  - "%PYTHON%\\python.exe -m coverage combine"
+    %PYTHON%\\python.exe -m pytest --cov --cov-config=.coveragerc --cov-report= -n auto --strict-markers -p no:cacheprovider -p no:stepwise --junit-xml=tests.xml
   - "%PYTHON%\\python.exe -m coverage report"
   - "%PYTHON%\\python.exe -m coverage xml"
   - "%PYTHON%\\python.exe -m codecov --file coverage.xml"

setup.cfg

@@ -6,9 +6,6 @@ extend-ignore = E203, W503
 [aliases]
 test=pytest
 
-[tool:pytest]
-addopts=--pyargs schema_salad
-
 [tool:isort]
 multi_line_output = 3
 include_trailing_comma = True

tox.ini

@@ -10,6 +10,9 @@ envlist =
 skipsdist = True
 skip_missing_interpreters = True
 
+[pytest]
+addopts=-n auto --pyargs schema_salad
+
 [gh-actions]
 python =
   3.6: py36
@@ -30,24 +33,18 @@ passenv =
   GITHUB_*
 deps =
   py{36,37,38,39}-{unit,lint,bandit,mypy}: -rrequirements.txt
-  py{36,37,38,39}-unit: codecov
   py{36,37,38,39}-{unit,mypy}: -rtest-requirements.txt
   py{36,37,38,39}-lint: flake8-bugbear
   py{36,37,38,39}-lint: black
   py{36,37,38,39}-bandit: bandit
   py{36,37,38,39}-mypy: -rmypy_requirements.txt
 
 setenv =
-  py{36,37,38,39}-unit: LC_ALL = C
+  py{36,37,38,39}-unit: LC_ALL = C.UTF-8
 
 commands =
   py{36,37,38,39}-unit: python -m pip install -U pip setuptools wheel
-  py{36,37,38,39}-unit: python -m pip install -e .
-  py{36,37,38,39}-unit: coverage run --parallel-mode -m pytest -n auto --strict-markers {posargs}
-  py{36,37,38,39}-unit: coverage combine
-  py{36,37,38,39}-unit: coverage report
-  py{36,37,38,39}-unit: coverage xml
-  py{36,37,38,39}-unit: codecov --file coverage.xml
+  py{36,37,38,39}-unit: make coverage-report coverage.xml
   py{36,37,38,39}-bandit: bandit --recursive --exclude schema_salad/tests/ schema_salad
   py{36,37,38,39}-lint: make flake8
   py{36,37,38,39}-lint: make format-check
@@ -57,7 +54,7 @@ commands =
 whitelist_externals =
   py{36,37,38,39}-lint: flake8
   py{36,37,38,39}-lint: black
-  py{36,37,38,39}-{mypy,shellcheck,lint}: make
+  py{36,37,38,39}-{mypy,shellcheck,lint,unit}: make
 
 [testenv:py39-pydocstyle]
 whitelist_externals = make