From 44b98c02a95eb63419ce5b8d0d5f691c05e5a2f3 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 4 Oct 2026 12:16:51 +0900 Subject: [PATCH] Use pyproject.toml to maintain coverage options ... to reduce independent config files for test tools. Change-Id: Idd5ed485100f0a5eea854ea02d71ccbf12951107 Signed-off-by: Takashi Kajinami --- .coveragerc | 7 ------- pyproject.toml | 13 +++++++++++++ tox.ini | 9 +++++---- 3 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index a1a9f99..0000000 --- a/.coveragerc +++ /dev/null @@ -1,7 +0,0 @@ -[run] -branch = True -source = oslo_upgradecheck -omit = oslo_upgradecheck/tests/* - -[report] -ignore_errors = True diff --git a/pyproject.toml b/pyproject.toml index 56a8495..4e401d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,6 +34,19 @@ Repository = "https://opendev.org/openstack/oslo.upgradecheck" [tool.setuptools.packages.find] include = ["oslo_upgradecheck*"] +[tool.coverage.run] +source = [ + "oslo_upgradecheck" +] +branch = true +omit = [ + "oslo_upgradecheck/tests/*" +] + +[tool.coverage.report] +ignore_errors = true +show_missing = true + [tool.mypy] python_version = "3.11" show_column_numbers = true diff --git a/tox.ini b/tox.ini index 2415404..1ff6097 100644 --- a/tox.ini +++ b/tox.ini @@ -38,17 +38,18 @@ commands = commands = {posargs} [testenv:cover] -deps = {[testenv]deps} - coverage +deps = + {[testenv]deps} + coverage>=5.0 # Apache-2.0 setenv = PYTHON=coverage run --source oslo_upgradecheck --parallel-mode commands = coverage erase - stestr run {posargs} + {[testenv]commands} coverage combine coverage html -d cover coverage xml -o cover/coverage.xml - coverage report --show-missing + coverage report [testenv:docs] allowlist_externals =