run.sh: more readable coverage commands.

Author: lemon24

pyproject.toml

@@ -97,7 +97,6 @@ tests = [
     "pytest-subtests",
     "pytest-rerunfailures",
     "coverage",
-    "pytest-cov",
     "requests-mock",
     # mechanicalsoup hard-depends on lxml (see below)
     'mechanicalsoup; (implementation_name != "pypy" and python_version <= "3.12")',

run.sh

@@ -36,28 +36,21 @@ function install-dev {
     pre-commit install --install-hooks
 }
 
-
 function test {
     pytest --runslow "$@"
 }
 
-
-function coverage-all {
-    clean-pyc
-    # TODO: do we need to --cov-context=test all the time?
-    coverage-run --cov-context=test "$@"
-    coverage-report --show-contexts
-}
-
-function coverage-run {
-    # TODO: is pytest-cov needed?
-    pytest --runslow --cov "$@"
+function coverage {
+    unset -f coverage
+    coverage run -m pytest --runslow "$@"
+    coverage html
+    coverage-report
 }
 
 function coverage-report {
-    coverage html "$@"
+    # library only "coverage report --fail-under 100"
+    unset -f coverage
     coverage report \
-        --include '*/reader/*' \
         --omit "$(
             echo "
                 */reader/_vendor/*
@@ -76,7 +69,7 @@ function coverage-report {
 
 
 function test-all {
-    tox -p
+    tox p "$@"
 }
 
 
@@ -147,21 +140,12 @@ function entr-project-files {
 }
 
 
-function clean-pyc {
-    local IFS=$'\n'
-    find \
-        $( ls-project-files | grep / | cut -d/ -f1 | uniq ) \
-        -name '*.pyc' -or -name '*.pyo' \
-        -exec rm -rf {} +
-}
-
-
 function ci-install {
     pip install -e '.[all]' --group tests --group typing
 }
 
 function ci-run {
-    coverage-run -v && coverage-report && typing
+    command coverage run -m pytest --runslow && coverage-report && typing
 }
 
 

tox.ini

@@ -8,7 +8,7 @@ dependency_groups = tests
 allowlist_externals =
     ./run.sh
 
-commands = {posargs:./run.sh coverage-run --cov-append -v}
+commands = coverage run --append -m pytest --runslow
 
 depends =
     py{313,312,311,py311}: coverage-clean
@@ -22,7 +22,9 @@ commands = coverage erase
 [testenv:coverage-report]
 deps = coverage
 skip_install = true
-commands = ./run.sh coverage-report
+commands =
+    coverage html
+    ./run.sh coverage-report
 
 [testenv:typing]
 dependency_groups = typing