Attempt to make codecov less important

.github/workflows/main.yml

@@ -4,9 +4,9 @@ on:
   push:
     branches:
       - main
+    tags:
+      - "*"
   pull_request:
-    branches:
-      - main
 
 concurrency:
   group: ci-main-${{ github.ref }}
@@ -20,11 +20,88 @@ permissions: {}
 
 jobs:
   test:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.allow_failure }}
     timeout-minutes: 15
     permissions:
       contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: linting,docs
+            python: '3.13'
+            allow_failure: false
+
+          # Explicitly test min pytest.
+          - name: py313-dj52-sqlite-pytestmin-coverage
+            python: '3.13'
+            allow_failure: false
+
+          - name: py313-dj52-postgres-xdist-coverage
+            python: '3.13'
+            allow_failure: false
+
+          - name: py313-dj51-postgres-xdist-coverage
+            python: '3.13'
+            allow_failure: false
+
+          - name: py312-dj42-postgres-xdist-coverage
+            python: '3.12'
+            allow_failure: false
+
+          - name: py311-dj50-postgres-xdist-coverage
+            python: '3.11'
+            allow_failure: false
+
+          - name: py311-dj42-postgres-xdist-coverage
+            python: '3.11'
+            allow_failure: false
+
+          - name: py310-dj52-postgres-xdist-coverage
+            python: '3.10'
+            allow_failure: false
+
+          - name: py310-dj51-postgres-xdist-coverage
+            python: '3.10'
+            allow_failure: false
+
+          - name: py310-dj42-postgres-xdist-coverage
+            python: '3.10'
+            allow_failure: false
+
+          - name: py311-dj51-mysql-coverage
+            python: '3.11'
+            allow_failure: false
+
+          - name: py310-dj42-mysql-coverage
+            python: '3.10'
+            allow_failure: false
+
+          - name: py39-dj42-mysql-xdist-coverage
+            python: '3.9'
+            allow_failure: false
+
+          - name: py313-djmain-sqlite-coverage
+            python: '3.13'
+            allow_failure: true
+
+          - name: py313-dj52-sqlite-coverage
+            python: '3.13'
+            allow_failure: true
+
+          - name: py312-dj51-sqlite-xdist-coverage
+            python: '3.12'
+            allow_failure: false
+
+          - name: py311-dj42-sqlite-xdist-coverage
+            python: '3.11'
+            allow_failure: false
+
+          # pypy3: not included with coverage reports (much slower then).
+          - name: pypy3-dj42-postgres
+            python: 'pypy3.9'
+            allow_failure: false
     steps:
       - uses: actions/checkout@v4
         with:
@@ -50,104 +127,94 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.11.1
+          pip install tox==4.26.0
 
       - name: Run tox
         run: tox -e ${{ matrix.name }}
 
-      - name: Report coverage
+      - name: Prepare coverage file for upload
         if: contains(matrix.name, 'coverage')
-        uses: codecov/codecov-action@v5
-        with:
-          fail_ci_if_error: true
-          files: ./coverage.xml
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - name: linting,docs
-          python: '3.13'
-          allow_failure: false
-
-        # Explicitly test min pytest.
-        - name: py313-dj52-sqlite-pytestmin-coverage
-          python: '3.13'
-          allow_failure: false
-
-        - name: py313-dj52-postgres-xdist-coverage
-          python: '3.13'
-          allow_failure: false
-
-        - name: py313-dj51-postgres-xdist-coverage
-          python: '3.13'
-          allow_failure: false
-
-        - name: py312-dj42-postgres-xdist-coverage
-          python: '3.12'
-          allow_failure: false
-
-        - name: py311-dj50-postgres-xdist-coverage
-          python: '3.11'
-          allow_failure: false
-
-        - name: py311-dj42-postgres-xdist-coverage
-          python: '3.11'
-          allow_failure: false
-
-        - name: py310-dj52-postgres-xdist-coverage
-          python: '3.10'
-          allow_failure: false
+        run: mv .coverage coverage.${{ matrix.name }}
 
-        - name: py310-dj51-postgres-xdist-coverage
-          python: '3.10'
-          allow_failure: false
-
-        - name: py310-dj42-postgres-xdist-coverage
-          python: '3.10'
-          allow_failure: false
-
-        - name: py311-dj51-mysql-coverage
-          python: '3.11'
-          allow_failure: false
+      - name: Upload temporary coverage artifact
+        if: contains(matrix.name, 'coverage')
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-artifact-${{ matrix.name }}
+          path: coverage.${{ matrix.name }}
+          retention-days: 1
+
+  report-coverage:
+    name: Report Combined Coverage
+    runs-on: ubuntu-latest
+    needs: test
+    if: always()
+    permissions:
+      contents: read
+      actions: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
-        - name: py310-dj42-mysql-coverage
-          python: '3.10'
-          allow_failure: false
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+          check-latest: true
 
-        - name: py39-dj42-mysql-xdist-coverage
-          python: '3.9'
-          allow_failure: false
+      - name: Install coverage tool
+        run: python -m pip install coverage[toml]
 
-        - name: py313-djmain-sqlite-coverage
-          python: '3.13'
-          allow_failure: true
+      - name: Download all coverage artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: downloaded-coverage-artifacts
+          pattern: coverage-artifact-*
 
-        - name: py313-dj52-sqlite-coverage
-          python: '3.13'
-          allow_failure: true
+      - name: Combine coverage reports
+        run: |
+          mkdir combined_coverage_data
+          find downloaded-coverage-artifacts -type f -name 'coverage.*' -exec cp {} combined_coverage_data/ \;
+          coverage combine combined_coverage_data/*
+          coverage xml
+          coverage html
+          coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
+
+      - name: Upload combined .coverage file
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-file
+          path: .coverage
+          retention-days: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && 90 || 3 }}
+          include-hidden-files: true
 
-        - name: py312-dj51-sqlite-xdist-coverage
-          python: '3.12'
-          allow_failure: false
+      - name: Upload HTML coverage report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-html-report
+          path: htmlcov
+          retention-days: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && 90 || 3 }}
 
-        - name: py311-dj42-sqlite-xdist-coverage
-          python: '3.11'
-          allow_failure: false
+      - name: Delete temporary coverage artifacts from run
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: coverage-artifact-*
 
-        # pypy3: not included with coverage reports (much slower then).
-        - name: pypy3-dj42-postgres
-          python: 'pypy3.9'
-          allow_failure: false
+      - name: Report coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          files: ./coverage.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          verbose: true
 
   check:  # This job does nothing and is only used for the branch protection
     if: always()
 
     needs:
-    - test
+    - report-coverage
 
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
 
     steps:
     - name: Decide whether the needed jobs succeeded or failed

pyproject.toml

@@ -97,12 +97,18 @@ ignore_missing_imports = true
 parallel = true
 source = ["${PYTESTDJANGO_COVERAGE_SRC}."]
 branch = true
+omit = [
+    "pytest_django/_version.py",
+]
 [tool.coverage.report]
 include = [
     "pytest_django/*",
     "pytest_django_test/*",
     "tests/*",
 ]
+omit = [
+    "pytest_django/_version.py",
+]
 skip_covered = true
 exclude_lines = [
     "pragma: no cover",

tox.ini

@@ -42,8 +42,6 @@ commands =
     coverage: coverage erase
     {env:PYTESTDJANGO_TEST_RUNNER:pytest} {posargs:tests}
     coverage: coverage combine
-    coverage: coverage report
-    coverage: coverage xml
 
 [testenv:linting]
 extras =