Merge branch 'master' into master

Author: ark-g

.github/workflows/codeql-analysis.yml

@@ -51,7 +51,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -62,7 +62,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3
+        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -76,4 +76,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3

.github/workflows/kit.yml

@@ -36,7 +36,7 @@ env:
   PIP_DISABLE_PIP_VERSION_CHECK: 1
   # PYVERSIONS: changing the list of versions will change the number of
   # expected distributions. This must match the same number in publish.yml.
-  EXPECTED: 67
+  EXPECTED: 66
 
 permissions:
   contents: read
@@ -254,58 +254,13 @@ jobs:
           path: dist/*
           retention-days: 7
 
-  pypy:
-    name: "PyPy wheel"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Check out the repo"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
-
-      - name: "Install PyPy"
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "pypy-3.9" # Minimum of PyPy PYVERSIONS
-          cache: pip
-          cache-dependency-path: 'requirements/*.pip'
-
-      - name: "Install requirements"
-        run: |
-          pypy3 -m pip install -r requirements/kit.pip
-
-      - name: "Build wheel"
-        env:
-          DIST_EXTRA_CONFIG: extra.cfg
-        run: |
-          # One wheel works for all PyPy versions. PYVERSIONS
-          # yes, this is weird syntax: https://github.com/pypa/build/issues/202
-          echo -e "[bdist_wheel]\npython_tag=pp39.pp310.pp311" > $DIST_EXTRA_CONFIG
-          pypy3 -m build -w
-
-      - name: "List wheels"
-        run: |
-          ls -al dist/
-
-      - name: "Check wheels"
-        run: |
-          python -m twine check dist/*
-
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: dist-pypy
-          path: dist/*.whl
-          retention-days: 7
-
   sign:
     # This signs our artifacts, but we don't use the signatures for anything
     # yet.  Someday maybe PyPI will have a way to upload and verify them.
     name: "Sign artifacts"
     needs:
       - wheels
       - non-binary
-      - pypy
     runs-on: ubuntu-latest
     permissions:
       id-token: write

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ defaults:
 env:
   # PYVERSIONS: changing the list of versions will change the number of
   # expected distributions. This must match the same number in kit.yml.
-  EXPECTED: 67
+  EXPECTED: 66
 
 permissions:
   contents: read

.github/workflows/quality.yml

@@ -80,7 +80,7 @@ jobs:
       - name: "Install Python"
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
-          python-version: "3.9" # Minimum of PYVERSIONS
+          python-version: "3.10" # Minimum of PYVERSIONS
           cache: pip
           cache-dependency-path: 'requirements/*.pip'
 
@@ -173,7 +173,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 #v6.3.0
+        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba #v6.3.1
         with:
           enable-cache: false
 

CHANGES.rst

@@ -47,12 +47,16 @@ Unreleased
   :ref:`config_json_output`, :ref:`config_lcov_output` and
   :ref:`config_run_debug_file`.  This is now fixed.
 
+- We no longer ship a PyPy-specific wheel. PyPy will install the pure-Python
+  wheel.  Closes `issue 2001`_.
+
 .. _issue 310: https://github.com/nedbat/coveragepy/issues/310
 .. _issue 312: https://github.com/nedbat/coveragepy/issues/312
 .. _issue 831: https://github.com/nedbat/coveragepy/issues/831
 .. _issue 1308: https://github.com/nedbat/coveragepy/issues/1308
 .. _issue 1845: https://github.com/nedbat/coveragepy/issues/1845
 .. _issue 1941: https://github.com/nedbat/coveragepy/issues/1941
+.. _issue 2001: https://github.com/nedbat/coveragepy/issues/2001
 
 
 .. start-releases

Makefile

@@ -116,6 +116,7 @@ _upgrade: $(DOCBIN)
 	$(PIP_COMPILE) -o requirements/light-threads.pip requirements/light-threads.in
 	$(PIP_COMPILE) -o requirements/mypy.pip requirements/mypy.in
 	$(PIP_COMPILE) -p $(DOCBIN)/python3 -o doc/requirements.pip doc/requirements.in
+	pre-commit autoupdate
 
 diff_upgrade:				## Summarize the last `make upgrade`
 	@# The sort flags sort by the package name first, then by the -/+, and

coverage/sysmon.py

@@ -140,7 +140,6 @@ def _wrapped(self: Any, *args: Any) -> Any:
                 except Exception as exc:
                     log(f"!!{exc.__class__.__name__}: {exc}")
                     if 1:
-                        # pylint: disable=no-value-for-parameter
                         log("".join(traceback.format_exception(exc)))
                     try:
                         assert sys_monitoring is not None

doc/requirements.pip

@@ -10,7 +10,7 @@ attrs==25.3.0
     # via scriv
 babel==2.17.0
     # via sphinx
-certifi==2025.6.15
+certifi==2025.7.14
     # via requests
 charset-normalizer==3.4.2
     # via requests

pyproject.toml

@@ -111,7 +111,7 @@ ignored-argument-names = "_|unused|.*_unused"
 ## PYTEST
 
 [tool.pytest.ini_options]
-addopts = "-q -n auto -p no:legacypath --strict-markers --no-flaky-report -rfEX --failed-first"
+addopts = "-q -n auto --dist=loadgroup -p no:legacypath --strict-markers --no-flaky-report -rfEX --failed-first"
 python_classes = "*Test"
 markers = [
     "expensive: too slow to run during \"make smoke\"",
@@ -138,15 +138,6 @@ xfail_strict = true
 # https://docs.pytest.org/en/stable/reference/reference.html#confval-verbosity_assertions
 verbosity_assertions = 5
 
-balanced_clumps = [
-    # Because of expensive session-scoped fixture:
-    "VirtualenvTest",
-    # Because of shared-file manipulations (~/tests/actual/testing):
-    "CompareTest",
-    # No idea why this one fails if run on separate workers:
-    "GetZipBytesTest",
-]
-
 ## Scriv
 
 [tool.scriv]

requirements/dev.pip

@@ -1,6 +1,6 @@
 # This file was autogenerated by uv via the following command:
 #    make upgrade
-astroid==3.3.10
+astroid==3.3.11
     # via pylint
 attrs==25.3.0
     # via
@@ -12,7 +12,7 @@ build==1.2.2.post1
     # via check-manifest
 cachetools==6.1.0
     # via tox
-certifi==2025.6.15
+certifi==2025.7.14
     # via requests
 chardet==5.2.0
     # via tox
@@ -53,7 +53,7 @@ flaky==3.8.1
     # via -r requirements/pytest.in
 greenlet==3.2.3
     # via -r requirements/dev.in
-hypothesis==6.135.24
+hypothesis==6.135.29
     # via -r requirements/pytest.in
 id==1.5.0
     # via twine