Merge pull request #21 from captainhammy/testing/tox-and-testing-impr…

…ovements

test: improvements to tox setup and execution

pyproject.toml

@@ -4,7 +4,7 @@
 
 [tool.pytest.ini_options]
     # Disable sugar as it interferes with pytester output parsing.
-    addopts = "-p no:sugar --cov --cov-report=html --cov-report=xml --color=yes"
+    addopts = "-p no:sugar --cov --cov-report=html --cov-report=xml --cov-fail-under=100 --color=yes"
 
 [tool.coverage]
 

setup.py

@@ -35,7 +35,6 @@
     ],
     extras_require={
         "test": [
-            "coverage",
             "pytest-cov",
             "tox",
         ]

tox.ini

@@ -1,6 +1,10 @@
 [tox]
-envlist = h20,ruff-check,ruff-format-check,isort-check,mypy,docstring-check
-skipsdist = true
+env_list = py310,ruff-check,ruff-format-check,isort-check,mypy,docstring-check
+no_package = true
+labels =
+    test = py310
+    static = ruff-check,ruff-format-check,isort-check,mypy,docstring-check
+    fix = ruff-format-run,isort-run,docstring-run
 
 [gh-actions]
 python =
@@ -9,53 +13,38 @@ python =
 
 [testenv]
 allowlist_externals=
-    coverage
     echo
-    env
     hython
 deps =
     .[test]
-setenv =
-    # Extra args to pass to the Hython command.  This is really only useful for local testing using
-    # my (Graham's) setup which relies on selecting the Houdini version via wrapper arg. When things
-    # are run automatically on Github the expected Houdini version is already sourced.
-    hython_extra=
-
+pass_env=*
+set_env =
+    # We need to explicitly setup the PYTHONPATH to include all the tox installed modules
+    # because hython will not load them by default, unlike if we were just using a standard
+    # Python interpreter.
+    PYTHONPATH = {envsitepackagesdir}
 commands =
-    coverage erase
-    # We need to force in the tox env as we won't be using the created venv and thus won't get the
-    # packages added to the path.
-    env PYTHONPATH={envsitepackagesdir} hython {env:hython_extra} -m pytest tests/
-    coverage report --fail-under=100 --skip-covered
-
-[testenv:h195]
-basepython=py39
-setenv =
-  hython_extra=--version 19.5
-
-[testenv:h20]
-basepython=py310
-setenv =
-  hython_extra=--version 20.0
+    hython -m pytest tests/
+    echo "View test coverage report at file://{toxinidir}/coverage_html_report/index.html"
 
 [testenv:ruff-check]
 deps = ruff
 commands = ruff check --preview src/ tests/
 
 [testenv:ruff-format-check]
-deps = ruff
+deps = {[testenv:ruff-check]deps}
 commands = ruff format --preview --check src/ tests/
 
 [testenv:ruff-format-run]
-deps = ruff
+deps = {[testenv:ruff-check]deps}
 commands = ruff format --preview src/ tests/
 
 [testenv:isort-check]
 deps = isort
 commands = isort --check src/ tests/ setup.py
 
 [testenv:isort-run]
-deps = isort
+deps = {[testenv:isort-check]deps}
 commands = isort src/ tests/ setup.py
 
 [testenv:mypy]
@@ -65,13 +54,11 @@ deps =
 commands = mypy
 
 [testenv:docstring-check]
-deps =
-    pydocstringformatter
+deps = pydocstringformatter
 commands = pydocstringformatter --exit-code src/
 
 [testenv:docstring-run]
-deps =
-    pydocstringformatter
+deps = {[testenv:docstring-check]deps}
 commands = pydocstringformatter --write src/
 
 [testenv:docs]