.github/workflows/codeql-analysis.yml

@@ -51,7 +51,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3
+      uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # 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@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3
+      uses: github/codeql-action/autobuild@6bb031afdd8eb862ea3fc1848194185e076637e5 # 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@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3
+      uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3

.github/workflows/coverage.yml

@@ -125,7 +125,7 @@ jobs:
           mv .metacov .metacov.$MATRIX_ID
 
       - name: "Upload coverage data"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: metacov-${{ env.MATRIX_ID }}
           path: .metacov.*
@@ -170,7 +170,7 @@ jobs:
           python igor.py zip_mods
 
       - name: "Download coverage data"
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
         with:
           pattern: metacov-*
           merge-multiple: true
@@ -184,7 +184,7 @@ jobs:
           python igor.py combine_html
 
       - name: "Upload HTML report"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: html_report
           path: htmlcov
@@ -239,7 +239,7 @@ jobs:
 
       - name: "Download coverage HTML report"
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
         with:
           name: html_report
           path: reports_repo/${{ env.report_dir }}

.github/workflows/kit.yml

@@ -182,7 +182,7 @@ jobs:
           python -m twine check wheelhouse/*
 
       - name: "Upload binary wheels"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: dist-${{ env.MATRIX_ID }}
           path: wheelhouse/*.whl
@@ -223,7 +223,7 @@ jobs:
           python -m twine check dist/*
 
       - name: "Upload non-binary artifacts"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: dist-non-binary
           path: dist/*
@@ -255,7 +255,7 @@ jobs:
         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" > $DIST_EXTRA_CONFIG
+          echo -e "[bdist_wheel]\npython_tag=pp39.pp310.pp311" > $DIST_EXTRA_CONFIG
           pypy3 -m build -w
 
       - name: "List wheels"
@@ -267,7 +267,7 @@ jobs:
           python -m twine check dist/*
 
       - name: "Upload wheels"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: dist-pypy
           path: dist/*.whl
@@ -286,7 +286,7 @@ jobs:
       id-token: write
     steps:
       - name: "Download artifacts"
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
         with:
           pattern: dist-*
           merge-multiple: true
@@ -308,7 +308,7 @@ jobs:
           ls -alR
 
       - name: "Upload signatures"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: signatures
           path: "*.sigstore.json"

.github/workflows/publish.yml

@@ -64,7 +64,7 @@ jobs:
 
     steps:
     - name: "Download dists"
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
       with:
         repository: "nedbat/coveragepy"
         run-id: ${{ needs.find-run.outputs.run-id }}
@@ -81,7 +81,7 @@ jobs:
         files=$(ls dist 2>/dev/null | wc -l) && [ "$files" -eq $EXPECTED ] || exit 1
 
     - name: "Generate attestations"
-      uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
+      uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
       with:
         subject-path: "dist/*"
 
@@ -104,7 +104,7 @@ jobs:
 
     steps:
     - name: "Download dists"
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
       with:
         repository: "nedbat/coveragepy"
         run-id: ${{ needs.find-run.outputs.run-id }}
@@ -121,7 +121,7 @@ jobs:
         files=$(ls dist 2>/dev/null | wc -l) && [ "$files" -eq $EXPECTED ] || exit 1
 
     - name: "Generate attestations"
-      uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
+      uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
       with:
         subject-path: "dist/*"
 

.github/workflows/testsuite.yml

@@ -54,15 +54,14 @@ jobs:
           - "3.14"
           - "pypy-3.9"
           - "pypy-3.10"
-        exclude:
-          # Windows pypy 3.9 and 3.10 get stuck with PyPy 7.3.15.  I hope to
-          # unstick them, but I don't want that to block all other progress, so
-          # skip them for now. These excludes can be removed once GitHub uses
-          # PyPy 7.3.16 on Windows.  https://github.com/pypy/pypy/issues/4876
-          - os: windows
-            python-version: "pypy-3.9"
-          - os: windows
-            python-version: "pypy-3.10"
+          - "pypy-3.11"
+        #
+        # If we need to exclude any combinations, do it like this:
+        #  exclude:
+        #    # Windows pypy 3.9 and 3.10 get stuck with PyPy 7.3.15.
+        #    - os: windows
+        #      python-version: "pypy-3.10"
+        #
         # If we need to tweak the os version we can do it with an include like
         # this:
         #  include:

CHANGES.rst

@@ -22,6 +22,34 @@ upgrading your version of coverage.py.
 
 .. start-releases
 
+.. _changes_7-7-0:
+
+Version 7.7.0 — 2025-03-16
+--------------------------
+
+- The Coverage object has a new method, :meth:`.Coverage.branch_stats` for
+  getting simple branch information for a module.  Closes `issue 1888`_.
+
+- The :class:`Coverage constructor<.Coverage>` now has a ``plugins`` parameter
+  for passing in plugin objects directly, thanks to `Alex Gaynor <pull
+  1919_>`_.
+
+- Many constant tests in if statements are now recognized as being optimized
+  away.  For example, previously ``if 13:`` would have been considered a branch
+  with one path not taken.  Now it is understood as always true and no coverage
+  is missing.
+
+- The experimental sys.monitoring support now works for branch coverage if you
+  are using Python 3.14.0 alpha 6 or newer.  This should reduce the overhead
+  coverage.py imposes on your test suite. Set the environment variable
+  ``COVERAGE_CORE=sysmon`` to try it out.
+
+- Confirmed support for PyPy 3.11. Thanks Michał Górny.
+
+.. _issue 1888: https://github.com/nedbat/coveragepy/issues/1888
+.. _pull 1919: https://github.com/nedbat/coveragepy/pull/1919
+
+
 .. _changes_7-6-12:
 
 Version 7.6.12 — 2025-02-11
@@ -1695,7 +1723,7 @@ Version 5.4 — 2021-01-24
 - Combining files on Windows across drives now works properly, fixing `issue
   577`_.  Thanks, `Valentin Lab <pr1080_>`_.
 
-- Fix an obscure warning from deep in the _decimal module, as reported in
+- Fix an obscure warning from deep in the decimal module, as reported in
   `issue 1084`_.
 
 - Update to support Python 3.10 alphas in progress, including `PEP 626: Precise

Makefile

@@ -288,6 +288,7 @@ RELNOTES_JSON = tmp/relnotes.json
 
 $(CHANGES_MD): CHANGES.rst $(DOCBIN)
 	$(SPHINXBUILD) -b rst doc tmp/rst_rst
+	pandoc --version
 	pandoc -frst -tmarkdown_strict --markdown-headings=atx --wrap=none tmp/rst_rst/changes.rst > $(CHANGES_MD)
 
 relnotes_json: $(RELNOTES_JSON)		## Convert changelog to JSON for further parsing.

README.rst

@@ -25,8 +25,8 @@ Coverage.py runs on these versions of Python:
 
 .. PYVERSIONS
 
-* Python 3.9 through 3.14 alpha 4, including free-threading.
-* PyPy3 versions 3.9 and 3.10.
+* Python 3.9 through 3.14 alpha 6, including free-threading.
+* PyPy3 versions 3.9, 3.10, and 3.11.
 
 Documentation is on `Read the Docs`_.  Code repository and issue tracker are on
 `GitHub`_.
@@ -35,6 +35,7 @@ Documentation is on `Read the Docs`_.  Code repository and issue tracker are on
 .. _GitHub: https://github.com/nedbat/coveragepy
 
 **New in 7.x:**
+``Coverage.branch_stats()``;
 multi-line exclusion patterns;
 function/class reporting;
 experimental support for sys.monitoring;

benchmark/README.rst

@@ -50,6 +50,15 @@ for the table.  There will be a row for each combination of the two dimensions.
 The `column` argument is the remaining dimension that is used to add columns to
 the table, one for each item in that dimension.
 
+To run a benchmark, create a Python file with a run_experiment call in it.
+Many are in run.py, guarded by ``if 0:`` and ``if 1:`` clauses.  In the
+benchmark directory, run your Python file.  If you haven't provided the
+``num_runs`` argument to run_experiment, put the number of runs on the command
+line::
+
+    % cd benchmark
+    % python3 run.py 3
+
 For example::
 
     run_experiment(

benchmark/benchmark.py

@@ -191,11 +191,15 @@ class ProjectToTest:
 
     # Where can we clone the project from?
     git_url: str = ""
+    local_git: str = ""
     slug: str = ""
     env_vars: Env_VarsType = {}
 
     def __init__(self) -> None:
-        url_must_exist(self.git_url)
+        if self.git_url:
+            url_must_exist(self.git_url)
+        if self.local_git:
+            file_must_exist(self.local_git)
         if not self.slug:
             if self.git_url:
                 self.slug = self.git_url.split("/")[-1]
@@ -211,12 +215,13 @@ def make_dir(self) -> None:
 
     def get_source(self, shell: ShellSession, retries: int = 5) -> None:
         """Get the source of the project."""
+        git_source = self.local_git or self.git_url
         for retry in range(retries):
             try:
-                shell.run_command(f"git clone {self.git_url} {self.dir}")
+                shell.run_command(f"git clone {git_source} {self.dir}")
                 return
             except Exception as e:
-                print(f"Retrying to clone {self.git_url} due to error:\n{e}")
+                print(f"Retrying to clone {git_source} due to error:\n{e}")
                 if retry == retries - 1:
                     raise e
 
@@ -423,6 +428,38 @@ def __init__(self, more_pytest_args: str = ""):
         self.slug = "mashbranch"
 
 
+class ProjectPillow(ProjectToTest):
+    git_url = "https://github.com/python-pillow/Pillow"
+    local_git = "/src/Pillow"
+
+    def __init__(self, more_pytest_args: str = ""):
+        super().__init__()
+        self.more_pytest_args = more_pytest_args
+
+    def prep_environment(self, env: Env) -> None:
+        env.shell.run_command(f"{env.python} -m pip install '.[tests]'")
+
+    def run_no_coverage(self, env: Env) -> float:
+        env.shell.run_command(f"{env.python} -m pytest {self.more_pytest_args}")
+        return env.shell.last_duration
+
+    def run_with_coverage(self, env: Env, cov_ver: Coverage) -> float:
+        env.shell.run_command(f"{env.python} -m pip install {cov_ver.pip_args}")
+        env.shell.run_command(
+            f"{env.python} -m pytest --cov=PIL --cov=Tests {self.more_pytest_args}"
+        )
+        duration = env.shell.last_duration
+        report = env.shell.run_command(f"{env.python} -m coverage report --precision=6")
+        print("Results:", report.splitlines()[-1])
+        return duration
+
+
+class ProjectPillowBranch(ProjectPillow):
+    def __init__(self, more_pytest_args: str = ""):
+        super().__init__(more_pytest_args="--cov-branch " + more_pytest_args)
+        self.slug = "Pilbranch"
+
+
 class ProjectOperator(ProjectToTest):
     git_url = "https://github.com/nedbat/operator"
 
@@ -823,7 +860,9 @@ def __init__(
         tweaks: TweaksType = None,
         env_vars: Env_VarsType = None,
     ):
+        # Check that it really is a coverage source directory.
         directory = file_must_exist(directory_name, "coverage directory")
+        file_must_exist(str(directory / "igor.py"))
         super().__init__(
             slug=slug,
             pip_args=str(directory),

benchmark/run.py

@@ -72,7 +72,7 @@
         ],
     )
 
-if 1:
+if 0:
     # Compare N Python versions
     vers = [10, 11, 12, 13]
     run_experiment(
@@ -93,28 +93,31 @@
         ],
     )
 
-if 0:
+if 1:
     # Compare sysmon on many projects
 
     run_experiment(
         py_versions=[
-            Python(3, 12),
+            # Python(3, 12),
+            AdHocPython("/usr/local/cpython", "main"),
         ],
         cov_versions=[
             NoCoverage("nocov"),
             CoverageSource(slug="ctrace", env_vars={"COVERAGE_CORE": "ctrace"}),
             CoverageSource(slug="sysmon", env_vars={"COVERAGE_CORE": "sysmon"}),
         ],
         projects=[
+            ProjectPillow(), #"-k test_pickle"),
+            ProjectPillowBranch(), #"-k test_pickle"),
             # ProjectSphinx(),  # Works, slow
-            ProjectPygments(),  # Works
+            # ProjectPygments(),  # Doesn't work on 3.14
             # ProjectRich(),  # Doesn't work
             # ProjectTornado(),  # Works, tests fail
             # ProjectDulwich(),  # Works
             # ProjectBlack(),  # Works, slow
             # ProjectMpmath(),  # Works, slow
-            ProjectMypy(),  # Works, slow
-            # ProjectHtml5lib(),  # Works
+            # ProjectMypy(),  # Works, slow
+            # ProjectHtml5lib(),  # Doesn't work on 3.14
             # ProjectUrllib3(),  # Works
         ],
         rows=["pyver", "proj"],

coverage/cmdline.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 import glob
-import optparse     # pylint: disable=deprecated-module
+import optparse
 import os
 import os.path
 import shlex