Fix coverage reporting across Python versions

Author: seanh

Makefile

@@ -42,9 +42,10 @@ coverage: python
 	pyenv exec tox -e coverage
 
 .PHONY: sure
-sure: checkformatting lint test coverage functests
+sure: checkformatting lint test functests
 	pyenv exec tox -e py39-tests
 	pyenv exec tox -e py38-tests
+	pyenv exec tox -e coverage
 	pyenv exec tox -e py39-functests
 	pyenv exec tox -e py38-functests
 
@@ -54,7 +55,7 @@ requirements:
 
 .PHONY: clean
 clean:
-	rm -rf build dist .tox
+	rm -rf build dist .coverage .tox
 	find . -path '*/__pycache__*' -delete
 	find . -path '*.egg-info*' -delete
 

pyproject.toml

@@ -2,6 +2,20 @@
 requires = ["setuptools>=42"]
 build-backend = "setuptools.build_meta"
 
+[tool.coverage.run]
+branch = true
+parallel = true
+source = ["python_multiversion_dependency_management_demo", "tests/unit"]
+
+[tool.coverage.paths]
+source = ["src", ".tox/*/site-packages"]
+
+[tool.coverage.report]
+show_missing = true
+precision = 2
+fail_under = 100.00
+skip_covered = true
+
 [tool.pydocstyle]
 ignore = [
     # Missing docstrings.

src/python_multiversion_dependency_management_demo/app.py

@@ -1,8 +1,16 @@
+import sys
+
 from flask import Flask
 
 app = Flask(__name__)
 
 
 @app.route("/")
 def hello_world():
-    return "<p>Hello, World!</p>"
+    if sys.version.startswith("3.9"):
+        return "<p>Hello, Python 3.9!</p>"
+
+    if sys.version.startswith("3.8"):
+        return "<p>Hello, Python 3.8!</p>"
+
+    return "<p>Hello, Python!</p>"

tests/functional/app_test.py

@@ -11,4 +11,4 @@ def client():
 def test_request_example(client):
     response = client.get("/")
 
-    assert b"<p>Hello, World!</p>" in response.data
+    assert b"<p>Hello, Python" in response.data

tests/unit/python_multiversion_dependency_management_demo/app_test.py

@@ -2,4 +2,4 @@
 
 
 def test_it():
-    assert hello_world() == "<p>Hello, World!</p>"
+    assert hello_world().startswith("<p>Hello, Python")

tox.ini

@@ -1,6 +1,5 @@
 [tox]
 envlist = py310-tests
-skipsdist = true
 minversion = 3.25.0
 requires =
   tox-pyenv
@@ -9,10 +8,10 @@ tox_pyenv_fallback = false
 isolated_build = true
 
 [testenv]
-skip_install = true
 recreate = true
+skip_install =
+    {format,checkformatting,coverage}: true
 setenv =
-    PYTHONPATH = src
     FLASK_APP = python_multiversion_dependency_management_demo.app
 deps =
     lint: -r requirements/py310/lint.txt
@@ -27,8 +26,6 @@ deps =
     py38-dev: -r requirements/py38/dev.txt
     py38-tests: -r requirements/py38/tests.txt
     py38-functests: -r requirements/py38/functests.txt
-depends =
-    coverage: tests
 commands =
     dev: flask run --port 5482
     lint: pylint src bin
@@ -41,5 +38,5 @@ commands =
     checkformatting: isort --quiet --check-only src tests bin
     tests: coverage run -m pytest -v {posargs:tests/unit/}
     functests: pytest {posargs:tests/functional/}
-    coverage: -coverage combine
+    coverage: coverage combine
     coverage: coverage report