Merge branch 'nedbat:master' into master

ark-g · web-flow · commit 4c79987f3105 · 2025-07-17T10:16:30.000+03:00
diff --git a/.github/workflows/codeql-analysis.yml b/.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
diff --git a/.github/workflows/kit.yml b/.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
diff --git a/.github/workflows/publish.yml b/.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
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -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
 
diff --git a/CHANGES.rst b/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
diff --git a/Makefile b/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
diff --git a/doc/requirements.pip b/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
diff --git a/requirements/dev.pip b/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
diff --git a/requirements/kit.pip b/requirements/kit.pip
@@ -1,6 +1,6 @@
 # This file was autogenerated by uv via the following command:
 #    make upgrade
-auditwheel==6.4.0
+auditwheel==6.4.1
     # via -r requirements/kit.in
 backports-tarfile==1.2.0
     # via jaraco-context
@@ -10,7 +10,7 @@ bracex==2.6
     # via cibuildwheel
 build==1.2.2.post1
     # via -r requirements/kit.in
-certifi==2025.6.15
+certifi==2025.7.14
     # via
     #   cibuildwheel
     #   requests
diff --git a/requirements/mypy.pip b/requirements/mypy.pip
@@ -12,7 +12,7 @@ execnet==2.1.1
     # via pytest-xdist
 flaky==3.8.1
     # via -r requirements/pytest.in
-hypothesis==6.135.24
+hypothesis==6.135.29
     # via -r requirements/pytest.in
 iniconfig==2.1.0
     # via pytest
diff --git a/requirements/pytest.pip b/requirements/pytest.pip
@@ -12,7 +12,7 @@ execnet==2.1.1
     # via pytest-xdist
 flaky==3.8.1
     # via -r requirements/pytest.in
-hypothesis==6.135.24
+hypothesis==6.135.29
     # via -r requirements/pytest.in
 iniconfig==2.1.0
     # via pytest
diff --git a/tests/coveragetest.py b/tests/coveragetest.py
@@ -401,21 +401,24 @@ def command_line(self, args: str, ret: int = OK) -> None:
     # https://salsa.debian.org/debian/pkg-python-coverage/-/blob/master/debian/patches/02.rename-public-programs.patch
     coverage_command = "coverage"
 
-    def run_command(self, cmd: str) -> str:
+    def run_command(self, cmd: str, *, status: int = 0) -> str:
         """Run the command-line `cmd` in a subprocess.
 
         `cmd` is the command line to invoke in a subprocess. Returns the
         combined content of `stdout` and `stderr` output streams from the
         subprocess.
 
+        Asserts that the exit status is `status` (default 0).
+
         See `run_command_status` for complete semantics.
 
         Use this when you need to test the process behavior of coverage.
 
         Compare with `command_line`.
 
         """
-        _, output = self.run_command_status(cmd)
+        actual_status, output = self.run_command_status(cmd)
+        assert actual_status == status
         return output
 
     def run_command_status(self, cmd: str) -> tuple[int, str]:
diff --git a/tests/helpers.py b/tests/helpers.py
@@ -34,10 +34,23 @@
 from coverage.types import TArc
 
 
-def run_command(cmd: str) -> tuple[int, str]:
+def _correct_encoding() -> str:
+    """Determine the right encoding to use for subprocesses."""
+    # Type checking trick due to "unreachable" being set
+    _locale_type_erased: Any = locale
+
+    encoding = os.device_encoding(1) or (
+        _locale_type_erased.getpreferredencoding()
+        if sys.version_info < (3, 11)
+        else _locale_type_erased.getencoding()
+    )
+    return encoding
+
+
+def subprocess_popen(cmd: str) -> subprocess.Popen[bytes]:
     """Run a command in a subprocess.
 
-    Returns the exit status code and the combined stdout and stderr.
+    Returns the Popen object.
 
     """
     # Subprocesses are expensive, but convenient, and so may be over-used in
@@ -47,20 +60,11 @@ def run_command(cmd: str) -> tuple[int, str]:
         with open(pth, "a", encoding="utf-8") as proctxt:
             print(os.getenv("PYTEST_CURRENT_TEST", "unknown"), file=proctxt, flush=True)
 
-    # Type checking trick due to "unreachable" being set
-    _locale_type_erased: Any = locale
-
-    encoding = os.device_encoding(1) or (
-        _locale_type_erased.getpreferredencoding()
-        if sys.version_info < (3, 11)
-        else _locale_type_erased.getencoding()
-    )
-
     # In some strange cases (PyPy3 in a virtualenv!?) the stdout encoding of
     # the subprocess is set incorrectly to ascii.  Use an environment variable
     # to force the encoding to be the same as ours.
     sub_env = dict(os.environ)
-    sub_env['PYTHONIOENCODING'] = encoding
+    sub_env["PYTHONIOENCODING"] = _correct_encoding()
 
     proc = subprocess.Popen(
         cmd,
@@ -70,11 +74,21 @@ def run_command(cmd: str) -> tuple[int, str]:
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
     )
+    return proc
+
+
+def run_command(cmd: str) -> tuple[int, str]:
+    """Run a command in a subprocess.
+
+    Returns the exit status code and the combined stdout and stderr.
+
+    """
+    proc = subprocess_popen(cmd)
     output, _ = proc.communicate()
     status = proc.returncode
 
     # Get the output, and canonicalize it to strings with newlines.
-    output_str = output.decode(encoding).replace("\r", "")
+    output_str = output.decode(_correct_encoding()).replace("\r", "")
     return status, output_str
 
 
diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
@@ -222,7 +222,7 @@ def try_some_code(
         self.make_file("try_it.py", code)
 
         cmd = f"coverage run --concurrency={concurrency} try_it.py"
-        out = self.run_command(cmd)
+        _, out = self.run_command_status(cmd)
 
         expected_cant_trace = cant_trace_msg(concurrency, the_module)
 
@@ -342,7 +342,7 @@ def gwork(q):
             answer = q.get()
             assert answer == 1
             """)
-        out = self.run_command("coverage run --concurrency=thread,gevent both.py")
+        _, out = self.run_command_status("coverage run --concurrency=thread,gevent both.py")
         if gevent is None:
             assert out == (
                 "Couldn't trace with concurrency=gevent, the module isn't installed.\n"
@@ -475,7 +475,7 @@ def try_multiprocessing_code(
             """)
 
         cmd = f"coverage run {args} multi.py {start_method}"
-        out = self.run_command(cmd)
+        _, out = self.run_command_status(cmd)
         expected_cant_trace = cant_trace_msg(concurrency, the_module)
 
         if expected_cant_trace is not None:
@@ -591,7 +591,7 @@ def test_multiprocessing_bootstrap_error_handling(self) -> None:
             concurrency = multiprocessing
             _crash = _bootstrap
             """)
-        out = self.run_command("coverage run multi.py")
+        out = self.run_command("coverage run multi.py", status=1)
         assert "Exception during multiprocessing bootstrap init" in out
         assert "RuntimeError: Crashing because called by _bootstrap" in out
 
@@ -770,7 +770,8 @@ def test_sigterm_threading_saves_data(self) -> None:
             concurrency = thread
             sigterm = true
             """)
-        out = self.run_command("coverage run handler.py")
+        status, out = self.run_command_status("coverage run handler.py")
+        assert status != 0
         out_lines = out.splitlines()
         assert len(out_lines) in [2, 3]
         assert out_lines[:2] == ["START", "SIGTERM"]
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -1171,20 +1171,20 @@ def test_missing_line_ending(self) -> None:
         # https://github.com/nedbat/coveragepy/issues/293
 
         self.make_file("normal.py", """\
-            out, err = subprocess.Popen(
-                [sys.executable, '-c', 'pass'],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE).communicate()
+            out, err = some_module.some_function(
+                ["my data", "-c", "pass"],
+                arg1=some_module.NAME,
+                arg2=some_module.OTHER_NAME).function()
             """)
 
         parser = self.parse_file("normal.py")
         assert parser.statements == {1}
 
         self.make_file("abrupt.py", """\
-            out, err = subprocess.Popen(
-                [sys.executable, '-c', 'pass'],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE).communicate()""")   # no final newline.
+            out, err = some_module.some_function(
+                ["my data", "-c", "pass"],
+                arg1=some_module.NAME,
+                arg2=some_module.OTHER_NAME).function()""")   # no final newline.
 
         # Double-check that some test helper wasn't being helpful.
         with open("abrupt.py", encoding="utf-8") as f:
diff --git a/tests/test_process.py b/tests/test_process.py
diff --git a/tests/test_testing.py b/tests/test_testing.py
