coverage 7.15.4__tar.gz → 7.16.0__tar.gz

{coverage-7.15.4 → coverage-7.16.0}/.github/workflows/codeql-analysis.yml

@@ -55,7 +55,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
+        uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +66,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@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
+        uses: github/codeql-action/autobuild@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -80,4 +80,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
+        uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7

{coverage-7.15.4 → coverage-7.16.0}/.github/workflows/coverage.yml

@@ -44,7 +44,7 @@ jobs:
           persist-credentials: false
 
       - name: "Examine changed files"
-        uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+        uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
         id: filter
         with:
           filters: |

{coverage-7.15.4 → coverage-7.16.0}/.github/workflows/kit.yml

@@ -309,7 +309,7 @@ jobs:
           files=$(find coverage-* 2>/dev/null | wc -l) && [ "$files" -eq "$EXPECTED" ] || exit 1
 
       - name: "Sign artifacts"
-        uses: sigstore/gh-action-sigstore-python@5b79a39c381910c090341a2c9b0bf022c8b387e1 # v3.4.0
+        uses: sigstore/gh-action-sigstore-python@790bc6befb9d733738f18d8f895854b453640ec9 # v3.5.0
         with:
           inputs: coverage-*.*
 

{coverage-7.15.4 → coverage-7.16.0}/.github/workflows/publish.yml

@@ -86,12 +86,12 @@ jobs:
           files=$(find dist/* 2>/dev/null | wc -l) && [ "$files" -eq "$EXPECTED" ] || exit 1
 
       - name: "Generate attestations"
-        uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
+        uses: actions/attest-build-provenance@4d101475d8b20a2381f78447822ac1eab6504dd8 # v4.2.2
         with:
           subject-path: "dist/*"
 
       - name: "Publish dists to Test PyPI"
-        uses: pypa/gh-action-pypi-publish@ba38be9e461d3875417946c167d0b5f3d385a247 # v1.14.1
+        uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
         with:
           repository-url: https://test.pypi.org/legacy/
 
@@ -127,9 +127,9 @@ jobs:
           files=$(find dist/* 2>/dev/null | wc -l) && [ "$files" -eq "$EXPECTED" ] || exit 1
 
       - name: "Generate attestations"
-        uses: actions/attest-build-provenance@0f67c3f4856b2e3261c31976d6725780e5e4c373 # v4.1.1
+        uses: actions/attest-build-provenance@4d101475d8b20a2381f78447822ac1eab6504dd8 # v4.2.2
         with:
           subject-path: "dist/*"
 
       - name: "Publish dists to PyPI"
-        uses: pypa/gh-action-pypi-publish@ba38be9e461d3875417946c167d0b5f3d385a247 # v1.14.1
+        uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2

{coverage-7.15.4 → coverage-7.16.0}/.github/workflows/quality.yml

@@ -43,7 +43,7 @@ jobs:
           persist-credentials: false
 
       - name: "Examine changed files"
-        uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+        uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
         id: filter
         with:
           filters: |
@@ -52,6 +52,7 @@ jobs:
             docs:
               - "doc/**"
               - "coverage/**.py"
+              - "*.rst"
             actions:
               - ".github/workflows/**"
             workflow:
@@ -184,7 +185,7 @@ jobs:
           persist-credentials: false
 
       - name: "Install uv"
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@ae62891fec2bb8e7d6c99fc78c9fec3a63790f8d # v10.0.0
         with:
           enable-cache: false
 

{coverage-7.15.4 → coverage-7.16.0}/.github/workflows/testsuite.yml

@@ -43,7 +43,7 @@ jobs:
           persist-credentials: false
 
       - name: "Examine changed files"
-        uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+        uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
         id: filter
         with:
           filters: |

coverage-7.16.0/.gitignore

@@ -0,0 +1,59 @@
+# Files that can appear anywhere in the tree.
+*.pyc
+*.pyo
+*$py.class
+*.pyd
+*.so
+*.bak
+.coverage
+.coverage.*
+.metacov
+.metacov.*
+*.swp
+
+# Data files we should ignore in the root, but need for gold files.
+/coverage.xml
+/coverage.json
+/coverage.lcov
+
+# Stuff generated by editors.
+.idea/
+.vscode/
+.vimtags
+
+# Stuff in the root.
+build
+*.egg-info
+cheats.txt
+dist
+htmlcov
+MANIFEST
+setuptools-*.egg
+.tox
+.noseids
+.cache
+.pytest_cache
+.hypothesis
+.ruby-version
+.venv
+
+# Stuff in the test directory.
+covmain.zip
+zipmods.zip
+zip1.zip
+tests/actual
+
+# Stuff in the doc directory.
+doc/_build
+doc/_spell
+doc/sample_html
+doc/sample_html_beta
+
+# Build intermediaries.
+tmp
+a1_coverage.pth
+
+# OS junk
+.DS_Store
+
+!.github

{coverage-7.15.4 → coverage-7.16.0}/.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
         exclude: "stress_phystoken|\\.py,cover$"
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.16.1
+    rev: v0.16.4
     hooks:
       - id: ruff-format
 

{coverage-7.15.4 → coverage-7.16.0}/CHANGES.rst

@@ -22,6 +22,61 @@ upgrading your version of coverage.py.
 
 .. start-releases
 
+.. _changes_7-16-0:
+
+Version 7.16.0 — 2026-08-28
+---------------------------
+
+- When combining files, now path separator slashes will automatically be
+  converted to the local file system style. This makes it less necessary to
+  define ``[paths]`` configuration to combine data across operating systems.
+  Fixes `issue 2266`_.
+
+- The :meth:`.Coverage.switch_context` method now returns the previous context.
+
+- Fix: previously, a ``[paths]`` pattern would be replaced everywhere in a file
+  path when it was only meant to be replaced once, in the leading portion of
+  the path. This is now fixed, in `pull 2268`_.
+
+- Fixes to validation of options and configuration settings:
+
+  - Negative precision settings now always cause useful error messages (`pull
+    2261`_).
+
+  - An invalid regex in the ``--contexts`` option (or the ``[report]
+    contexts`` setting) reported a confusing "Couldn't use data file ...:
+    user-defined function raised exception" error. Now it raises a proper
+    configuration error naming the bad regex, like other regex settings do
+    (`pull 2262`_).
+
+  - Non-string values in TOML configuration settings now produce a helpful
+    error message instead of a traceback.  This affects list settings whose
+    elements aren't strings (like ``omit``, ``exclude_lines``, or a ``[paths]``
+    entry), file settings like ``data_file``, and any wrong-typed value in the
+    ``[paths]`` section (`pull 2263`_).
+
+  - ``coverage run`` refuses run-affecting command-line options like
+    ``--branch`` alongside ``--concurrency=multiprocessing``, since they can't
+    reach the subprocesses.  The check only recognized ``multiprocessing`` as
+    the entire option value, so ``--concurrency=multiprocessing,thread``
+    slipped through and failed later with "Can't combine statement coverage
+    data with branch data".  Each named concurrency library is now properly
+    considered (`pull 2270`_).
+
+- Fix: ``coverage annotate -d DIR`` raised an ``AssertionError`` if any
+  measured file had an extension other than ``.py``, such as a ``.pyw`` file on
+  Windows.  The original extension is now restored on the annotated copy (`pull
+  2265`_).
+
+.. _pull 2261: https://github.com/coveragepy/coveragepy/pull/2261
+.. _pull 2262: https://github.com/coveragepy/coveragepy/pull/2262
+.. _pull 2263: https://github.com/coveragepy/coveragepy/pull/2263
+.. _pull 2265: https://github.com/coveragepy/coveragepy/pull/2265
+.. _issue 2266: https://github.com/coveragepy/coveragepy/issues/2266
+.. _pull 2268: https://github.com/coveragepy/coveragepy/pull/2268
+.. _pull 2270: https://github.com/coveragepy/coveragepy/pull/2270
+
+
 .. _changes_7-15-4:
 
 Version 7.15.4 — 2026-08-06

{coverage-7.15.4 → coverage-7.16.0}/MANIFEST.in

@@ -10,6 +10,7 @@
 
 include .editorconfig
 include .git-blame-ignore-revs
+include .gitignore
 include .ignore
 include .pre-commit-config.yaml
 include .readthedocs.yaml

{coverage-7.15.4 → coverage-7.16.0}/Makefile

@@ -58,7 +58,7 @@ clean: debug_clean _clean_platform	#- Remove artifacts of test execution, instal
 	@rm -f .tox/*/lib/*/site-packages/a0_metacov.pth
 	@rm -f */.coverage */*/.coverage */*/*/.coverage */*/*/*/.coverage */*/*/*/*/.coverage */*/*/*/*/*/.coverage
 	@rm -f tests/covmain.zip tests/zipmods.zip tests/zip1.zip
-	@rm -rf doc/_build doc/_spell doc/sample_html_beta
+	@rm -rf doc/_build doc/_spell doc/sample_html doc/sample_html_beta
 	@rm -rf tmp
 	@rm -rf a1_coverage.pth
 	@rm -rf .*cache */.*cache */*/.*cache */*/*/.*cache .hypothesis
@@ -208,7 +208,7 @@ sample_html_beta: _sample_cog_html	#- Generate sample HTML report for a beta rel
 
 ### Kitting: making releases
 
-.PHONY: release_version edit_for_release cheats relbranch relcommit1 relcommit2
+.PHONY: release_version edit_for_release cheats relbranch relcommit1
 .PHONY: kit pypi_upload test_upload build_kits update_rtd
 .PHONY: _check_github_auth download_kits
 .PHONY: tag bump_version
@@ -231,10 +231,6 @@ relbranch:				# Create the branch for releasing (see howto.txt).
 relcommit1:				# Commit the first release changes (see howto.txt).
 	git commit -am "docs: prep for $$(python setup.py --version)"
 
-relcommit2:				# Commit the latest sample HTML report (see howto.txt).
-	git add doc/sample_html
-	git commit -am "docs: sample HTML for $$(python setup.py --version)"
-
 kit:					#- Make a source distribution and some wheels.
 	@# Makes sdist and binary wheel for current Python version and platform:
 	python -m build

{coverage-7.15.4 → coverage-7.16.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: coverage
-Version: 7.15.4
+Version: 7.16.0
 Summary: Code coverage measurement for Python
 Home-page: https://github.com/coveragepy/coveragepy
 Author: Ned Batchelder and 263 others
 Author-email: ned@nedbatchelder.com
 License: Apache-2.0
-Project-URL: Documentation, https://coverage.readthedocs.io/en/7.15.4
+Project-URL: Documentation, https://coverage.readthedocs.io/en/7.16.0
 Project-URL: Funding, https://tidelift.com/subscription/pkg/pypi-coverage?utm_source=pypi-coverage&utm_medium=referral&utm_campaign=pypi
 Project-URL: Issues, https://github.com/coveragepy/coveragepy/issues
 Project-URL: Mastodon, https://hachyderm.io/@coveragepy
@@ -84,7 +84,7 @@ Coverage.py runs on these versions of Python:
 Documentation is on `Read the Docs`_.  Code repository and issue tracker are on
 `GitHub`_.
 
-.. _Read the Docs: https://coverage.readthedocs.io/en/7.15.4/
+.. _Read the Docs: https://coverage.readthedocs.io/en/7.16.0/
 .. _GitHub: https://github.com/coveragepy/coveragepy
 
 
@@ -113,7 +113,7 @@ Getting Started
 Looking to run ``coverage`` on your test suite? See the `Quick Start section`_
 of the docs.
 
-.. _Quick Start section: https://coverage.readthedocs.io/en/7.15.4/#quick-start
+.. _Quick Start section: https://coverage.readthedocs.io/en/7.16.0/#quick-start
 
 
 Change history
@@ -121,7 +121,7 @@ Change history
 
 The complete history of changes is on the `change history page`_.
 
-.. _change history page: https://coverage.readthedocs.io/en/7.15.4/changes.html
+.. _change history page: https://coverage.readthedocs.io/en/7.16.0/changes.html
 
 
 Code of Conduct
@@ -140,7 +140,7 @@ Contributing
 Found a bug? Want to help improve the code or documentation? See the
 `Contributing section`_ of the docs.
 
-.. _Contributing section: https://coverage.readthedocs.io/en/7.15.4/contributing.html
+.. _Contributing section: https://coverage.readthedocs.io/en/7.16.0/contributing.html
 
 
 Security
@@ -168,7 +168,7 @@ Licensed under the `Apache 2.0 License`_.  For details, see `NOTICE.txt`_.
     :target: https://github.com/coveragepy/coveragepy/actions/workflows/quality.yml
     :alt: Quality check status
 .. |docs| image:: https://readthedocs.org/projects/coverage/badge/?version=latest&style=flat
-    :target: https://coverage.readthedocs.io/en/7.15.4/
+    :target: https://coverage.readthedocs.io/en/7.16.0/
     :alt: Documentation
 .. |kit| image:: https://img.shields.io/pypi/v/coverage
     :target: https://pypi.org/project/coverage/

{coverage-7.15.4 → coverage-7.16.0}/ci/comment_on_fixes.py

@@ -7,7 +7,6 @@ import re
 import sys
 
 from scriv.scriv import Scriv
-
 from session import get_session
 
 scriv = Scriv()

{coverage-7.15.4 → coverage-7.16.0}/coverage/__init__.py

@@ -15,6 +15,9 @@ from __future__ import annotations
 # We import names as themselves to indicate that. Pylint sees it as pointless,
 # so disable its warning.
 # pylint: disable=useless-import-alias
+#
+# Keep ruff from changing the imports in this file.
+# ruff: noqa: I001
 
 from coverage.version import (
     __version__ as __version__,

{coverage-7.15.4 → coverage-7.16.0}/coverage/annotate.py

@@ -75,9 +75,13 @@ class AnnotateReporter:
 
         if self.directory:
             ensure_dir(self.directory)
-            dest_file = os.path.join(self.directory, flat_rootname(fr.relative_filename()))
-            assert dest_file.endswith("_py")
-            dest_file = dest_file[:-3] + ".py"
+            rel_fname = fr.relative_filename()
+            dest_file = os.path.join(self.directory, flat_rootname(rel_fname))
+            # flat_rootname turned the dot of the extension into an underscore.
+            # Put the original extension back, whatever it is: .py, .pyw, or
+            # something a plugin measures.
+            ext = os.path.splitext(rel_fname)[1]
+            dest_file = dest_file[: len(dest_file) - len(ext)] + ext
         else:
             dest_file = fr.filename
         dest_file += ",cover"

{coverage-7.15.4 → coverage-7.16.0}/coverage/cmdline.py

@@ -24,7 +24,7 @@ from coverage.control import DEFAULT_DATAFILE
 from coverage.core import CTRACER_FILE
 from coverage.data import CoverageData, combinable_files, debug_data_file
 from coverage.debug import info_header, short_stack, write_formatted_info
-from coverage.exceptions import NoSource, CoverageException, _ExceptionDuringRun
+from coverage.exceptions import CoverageException, NoSource, _ExceptionDuringRun
 from coverage.execfile import PyRunner
 from coverage.results import display_covered, should_fail_under
 from coverage.version import __url__
@@ -1017,7 +1017,7 @@ class CoverageScript:
             show_help("Can't append to data files in parallel mode.")
             return ERR
 
-        if options.concurrency == "multiprocessing":
+        if "multiprocessing" in (options.concurrency or "").split(","):
             # Can't set other run-affecting command line options with
             # multiprocessing.
             for opt_name in ["branch", "include", "omit", "pylib", "source", "timid"]:

{coverage-7.15.4 → coverage-7.16.0}/coverage/collector.py

@@ -11,7 +11,7 @@ import os
 import sys
 from collections.abc import Callable, Collection, Mapping
 from types import FrameType
-from typing import Any, TypeVar, cast
+from typing import Any, ClassVar, TypeVar, cast
 
 from coverage import env
 from coverage.core import Core
@@ -57,7 +57,7 @@ class Collector:
     # The stack of active Collectors.  Collectors are added here when started,
     # and popped when stopped.  Collectors on the stack are paused when not
     # the top, and resumed when they become the top again.
-    _collectors: list[Collector] = []
+    _collectors: ClassVar[list[Collector]] = []
 
     def __init__(
         self,
@@ -385,7 +385,7 @@ class Collector:
         """
         return any(tracer.activity() for tracer in self.tracers)
 
-    def switch_context(self, new_context: str | None) -> None:
+    def switch_context(self, new_context: str | None) -> str | None:
         """Switch to a new dynamic context."""
         context: str | None
         self.flush_data()
@@ -395,7 +395,7 @@ class Collector:
                 context += "|" + new_context
         else:
             context = new_context
-        self.covdata.set_context(context)
+        return self.covdata.set_context(context)
 
     def disable_plugin(self, disposition: TFileDisposition) -> None:
         """Disable the plugin mentioned in `disposition`."""

{coverage-7.15.4 → coverage-7.16.0}/coverage/config.py

@@ -263,27 +263,31 @@ class CoverageConfig(TConfigurable, TPluginConfig):
         # Options for plugins
         self.plugin_options: dict[str, TConfigSectionOut] = {}
 
-    MUST_BE_LIST = {
-        "debug",
-        "concurrency",
-        "plugins",
-        "report_omit",
-        "report_include",
-        "run_omit",
-        "run_include",
-        "patch",
-    }
+    MUST_BE_LIST = frozenset(
+        (
+            "debug",
+            "concurrency",
+            "plugins",
+            "report_omit",
+            "report_include",
+            "run_omit",
+            "run_include",
+            "patch",
+        )
+    )
 
     # File paths to make absolute during serialization.
     # The pairs are (config_key, must_exist).
-    SERIALIZE_ABSPATH = {
-        ("data_file", False),
-        ("debug_file", False),
-        # `source` can be directories or modules, so don't abspath it if it
-        # doesn't exist.
-        ("source", True),
-        ("source_dirs", False),
-    }
+    SERIALIZE_ABSPATH = frozenset(
+        (
+            ("data_file", False),
+            ("debug_file", False),
+            # `source` can be directories or modules, so don't abspath it if it
+            # doesn't exist.
+            ("source", True),
+            ("source_dirs", False),
+        )
+    )
 
     def from_args(self, **kwargs: TConfigValueIn) -> None:
         """Read config values from `kwargs`."""
@@ -349,9 +353,12 @@ class CoverageConfig(TConfigurable, TPluginConfig):
 
         # [paths] is special
         if cp.has_section("paths"):
-            for option in cp.options("paths"):
-                self.paths[option] = cp.getlist("paths", option)
-                any_set = True
+            try:
+                for option in cp.options("paths"):
+                    self.paths[option] = cp.getlist("paths", option)
+                    any_set = True
+            except ValueError as err:
+                raise ConfigError(f"Couldn't read config file {filename}: {err}") from err
 
         # plugins can have options
         for plugin in self.plugins:
@@ -387,9 +394,9 @@ class CoverageConfig(TConfigurable, TPluginConfig):
     }
 
     # Mutually exclusive concurrency settings.
-    LIGHT_THREADS = {"greenlet", "eventlet", "gevent"}
+    LIGHT_THREADS = frozenset(("greenlet", "eventlet", "gevent"))
 
-    CONFIG_FILE_OPTIONS = [
+    CONFIG_FILE_OPTIONS = (
         # These are *args for _set_attr_from_config_option:
         #   (attr, where, type_="")
         #
@@ -462,7 +469,7 @@ class CoverageConfig(TConfigurable, TPluginConfig):
         # [lcov]
         ("lcov_output", "lcov:output", "file"),
         ("lcov_line_checksums", "lcov:line_checksums", "boolean"),
-    ]
+    )
 
     def _set_attr_from_config_option(
         self,