Streamlined coverage processing and versions (#2084)

Signed-off-by: Andreas Maier <maiera@de.ibm.com>

Author: andy-maier

Makefile

@@ -220,9 +220,6 @@ test_common_py_files := \
 # Directory for .done files
 done_dir := done
 
-# Determine whether pytest has the --no-print-logs option.
-pytest_no_log_opt := $(shell pytest --help 2>/dev/null |grep '\--no-print-logs' >/dev/null; if [ $$? -eq 0 ]; then echo '--no-print-logs'; else echo ''; fi)
-
 # Flake8 config file
 flake8_rc_file := .flake8
 
@@ -256,10 +253,11 @@ check_py_files := \
 # Packages whose dependencies are checked using pip-missing-reqs
 check_reqs_packages := pip_check_reqs virtualenv tox pipdeptree build pytest coverage coveralls flake8 ruff pylint jupyter notebook safety bandit towncrier sphinx
 
+pytest_general_opts := -s --color=yes
 ifdef TESTCASES
-  pytest_opts := $(TESTOPTS) -k '$(TESTCASES)'
+  pytest_test_opts := $(TESTOPTS) -k '$(TESTCASES)'
 else
-  pytest_opts := $(TESTOPTS)
+  pytest_test_opts := $(TESTOPTS)
 endif
 
 coverage_config_file := .coveragerc
@@ -692,13 +690,13 @@ endif
 
 .PHONY: unittest
 unittest: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done $(package_py_files) $(test_unit_py_files) $(test_common_py_files) $(coverage_config_file)
-	bash -c "PYTHONPATH=. coverage run --append -m pytest --color=yes $(pytest_no_log_opt) -s $(pytest_opts) $(test_dir)/unit"
+	bash -c "PYTHONPATH=. coverage run --append -m pytest $(pytest_general_opts) $(pytest_test_opts) $(test_dir)/unit"
 	coverage html
 	@echo "Makefile: $@ done."
 
 .PHONY: functiontest
 functiontest: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done $(package_py_files) $(test_function_py_files) $(test_function_yaml_files) $(test_common_py_files) $(coverage_config_file)
-	bash -c "PYTHONPATH=. coverage run --append -m pytest --color=yes $(pytest_no_log_opt) -s $(pytest_opts) $(test_dir)/function"
+	bash -c "PYTHONPATH=. coverage run --append -m pytest $(pytest_general_opts) $(pytest_test_opts) $(test_dir)/function"
 	coverage html
 	@echo "Makefile: $@ done."
 
@@ -717,14 +715,14 @@ endif
 
 .PHONY:	end2end
 end2end: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done $(package_py_files) $(test_end2end_py_files) $(test_common_py_files) $(coverage_config_file)
-	bash -c "PYTHONPATH=. TESTEND2END_LOAD=true coverage run --append -m pytest --color=yes $(pytest_no_log_opt) -v -s -m 'not check_hmcs' $(pytest_opts) $(test_dir)/end2end"
+	bash -c "PYTHONPATH=. TESTEND2END_LOAD=true coverage run --append -m pytest -v -m 'not check_hmcs' $(pytest_general_opts) $(pytest_test_opts) $(test_dir)/end2end"
 	coverage html
 	@echo "Makefile: $@ done."
 
 # TODO: Enable rc checking again once the remaining issues are resolved
 .PHONY:	end2end_mocked
 end2end_mocked: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done $(package_py_files) $(test_end2end_py_files) $(test_common_py_files) $(coverage_config_file) tests/end2end/mocked_inventory.yaml tests/end2end/mocked_vault.yaml tests/end2end/mocked_hmc_z16.yaml
-	bash -c "PYTHONPATH=. TESTEND2END_LOAD=true TESTINVENTORY=tests/end2end/mocked_inventory.yaml TESTVAULT=tests/end2end/mocked_vault.yaml coverage run --append -m pytest --color=yes $(pytest_no_log_opt) -v -s -m 'not check_hmcs' $(pytest_opts) $(test_dir)/end2end"
+	bash -c "PYTHONPATH=. TESTEND2END_LOAD=true TESTINVENTORY=tests/end2end/mocked_inventory.yaml TESTVAULT=tests/end2end/mocked_vault.yaml coverage run --append -m pytest -v -m 'not check_hmcs' $(pytest_general_opts) $(pytest_test_opts) $(test_dir)/end2end"
 	coverage html
 	@echo "Makefile: $@ done."
 
@@ -750,5 +748,5 @@ end2end_show:
 .PHONY:	end2end_check
 end2end_check: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done $(package_py_files) $(test_end2end_py_files) $(test_common_py_files) $(coverage_config_file)
 	-$(call RMDIR_R_FUNC,htmlcov.end2end)
-	bash -c "TESTEND2END_LOAD=true TESTCASES=test_hmcdef_check_all_hmcs coverage run --append -m pytest --color=yes $(pytest_no_log_opt) -v -s -m check_hmcs $(pytest_opts) $(test_dir)/end2end"
+	bash -c "TESTEND2END_LOAD=true TESTCASES=test_hmcdef_check_all_hmcs coverage run --append -m pytest -v -m check_hmcs $(pytest_general_opts) $(pytest_test_opts) $(test_dir)/end2end"
 	@echo "Makefile: $@ done."

dev-requirements.txt

@@ -46,17 +46,11 @@ pluggy>=1.5.0
 # decorator: covered in requirements.txt
 
 # Coverage reporting (no imports, invoked via coveralls script):
-# coveralls versions 4.0.0/4.0.1 have increased their pinning of coverage to <8,
-#   but they have also added a constraint for Python to <3.13. Due to that
-#   Python pinning, we need to use the older coverage and coveralls versions on
-#   Python>=3.13.
-# Note: The earlier repetition of pinnings to avoid pip backtracking no longer
-#       seems to be needed.
-coverage>=7.8.0,<8.0; python_version <= '3.12'
-coverage>=6.5.0,<7.0; python_version >= '3.13'
-coveralls>=4.0.1; python_version <= '3.12'
-coveralls>=3.3.0; python_version >= '3.13'
-# PyYAML: covered in direct deps for development
+# coveralls versions 4.0.0/4.0.1 require Python>=3.8 and pin Python<=3.12.
+# coveralls version 4.0.2 requires Python>=3.10 and no longer pins to a Python 3.x version.
+coverage>=7.8.0
+coveralls>=4.0.1; python_version == '3.9'
+coveralls>=4.0.2; python_version >= '3.10'
 
 # Safety CI by pyup.io
 # safety 3.6.1 fixes the issue with typer >=0.17.0, see https://github.com/pyupio/safety/issues/778

minimum-constraints-develop.txt

@@ -39,10 +39,9 @@ rfc3986-validator==0.1.1
 # decorator: covered in direct deps for installation
 
 # Coverage reporting (no imports, invoked via coveralls script):
-coverage==7.8.0; python_version <= '3.12'
-coverage==6.5.0; python_version >= '3.13'
-coveralls==4.0.1; python_version <= '3.12'
-coveralls==3.3.0; python_version >= '3.13'
+coverage==7.8.0
+coveralls==4.0.1; python_version == '3.9'
+coveralls==4.0.2; python_version >= '3.10'
 
 # Safety CI by pyup.io
 safety==3.6.2