Fixup PR gh-207

Author: neutrinoceros

.github/workflows/test_tox.yml

@@ -158,6 +158,15 @@ jobs:
             a/
           cache-key: cache-${{ github.run_id }}
 
+  test_coverage_github:
+    uses: ./.github/workflows/tox.yml
+    with:
+      pytest: true
+      coverage: github
+      envs: |
+         - linux: py313-covcheck
+         - linux: py314-covcheck
+
   test_artifact_upload:
     uses: ./.github/workflows/tox.yml
     with:

.github/workflows/tox.yml

@@ -219,43 +219,46 @@ jobs:
 
       - run: python -m tox -e ${{ matrix.toxenv }} ${{ matrix.toxargs }} -- ${{ matrix.pytest_flag }} ${{ matrix.posargs }}
 
-      - if: ${{ (success() || failure()) && matrix.artifact-path != '' }}
+      - if: ${{ !cancelled() && matrix.artifact-path != '' }}
         uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{ matrix.artifact-name }}
           path: ${{ matrix.artifact-path }}
 
-      - if: ${{ (success() || failure()) && matrix.pytest-results-summary == 'true' && matrix.pytest == 'true' }}
+      - if: ${{ !cancelled() && matrix.pytest-results-summary == 'true' && matrix.pytest == 'true' }}
         uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
         with:
           paths: "**/results.xml"
 
       - name: Upload to Codecov
         # Even if tox fails, upload coverage
-        if: ${{ (success() || failure()) && contains(matrix.coverage, 'codecov') && matrix.pytest == 'true' }}
+        if: ${{ !cancelled() && contains(matrix.coverage, 'codecov') && matrix.pytest == 'true' }}
         uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Upload coverage data to GitHub
-        if: ${{ (success() || failure()) && contains(matrix.coverage, 'github') && matrix.pytest == 'true' }}
-        uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() && contains(matrix.coverage, 'github') && matrix.pytest == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: .coverage.${{ github.sha }}-${{ runner.os }}-${{ runner.arch }}-${{ matrix.toxenv }}
-          path: "${{ github.workspace }}/**/.coverage"
+          path: "${{ github.workspace }}/**/.coverage*"
+          if-no-files-found: error
+          include-hidden-files: true
+
 
   report_overall_test_coverage:
     needs: [ tox ]
     if: always()
     name: report overall test coverage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           lfs: true
           submodules: ${{ inputs.submodules }}
           ref: ${{ inputs.checkout_ref }}
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           pattern: .coverage.*
           merge-multiple: true
@@ -264,17 +267,20 @@ jobs:
           [ "$(ls -A .coverage*)" ] && exit 0 || exit 1
         continue-on-error: true
       - if: steps.check_downloaded_files.outcome == 'success'
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: "3.12"
       - if: steps.check_downloaded_files.outcome == 'success'
         name: generate coverage report
         run: |
-          python -Im pip install --upgrade coverage[toml]
+          python -Im pip install 'pip>=25.1'
+          python -Im pip install --group covcheck
           python -Im coverage combine
           python -Im coverage report -i -m --format=markdown >> $GITHUB_STEP_SUMMARY
       - if: steps.check_downloaded_files.outcome == 'success'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: .coverage
           path: .coverage
+          if-no-files-found: error
+          include-hidden-files: true

pyproject.toml

@@ -26,6 +26,10 @@ concurrency = [
     "pytest-repeat>=0.9.3",
     "pytest-run-parallel>=0.4.4",
 ]
+covcheck = [
+    "coverage[toml] ; python_version < '3.11'",
+    "coverage>=7.11.3",
+]
 test = [
     "hypothesis>=6.113.0",
     "pytest>=8.3.5",

tox.ini

@@ -7,6 +7,7 @@ envlist =
     py{,py}3{10,13}-python_version
     libraries
     cache-{setup,verify}
+    covcheck
 
 [testenv]
 allowlist_externals =
@@ -17,6 +18,9 @@ allowlist_externals =
     bash
     rolldice
     which
+dependency_groups =
+   covcheck: covcheck
+   covcheck: test
 skip_install = true
 passenv = MY_VAR
 commands =
@@ -48,6 +52,7 @@ commands =
     artifact-upload: bash -c "echo 'hello world' > test.txt"
     # Verify that freethreaded builds are using freethreaded interpreter
     py313t: python -c "import sys; assert 'free-threading' in sys.version"
+    covcheck: coverage run --parallel-mode -m pytest --pyargs test_package {posargs}
 
 [testenv:pep8]
 description = verify pep8