diff-cover 10.6.0__tar.gz → 11.0.0__tar.gz

{diff_cover-10.6.0 → diff_cover-11.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: diff_cover
-Version: 10.6.0
+Version: 11.0.0
 Summary: Run coverage and linting reports on diffs
 Project-URL: Homepage, https://github.com/Bachmann1234/diff-cover
 Project-URL: Repository, https://github.com/Bachmann1234/diff-cover
@@ -14,21 +14,20 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: chardet>=3.0.0
 Requires-Dist: jinja2>=2.7.1
 Requires-Dist: pluggy<2,>=0.13.1
 Requires-Dist: pygments<3,>=2.19.1
 Provides-Extra: toml
-Requires-Dist: tomli>=1.2.1; extra == 'toml'
 Description-Content-Type: text/x-rst
 
 diff-cover |pypi-version| |conda-version| |build-status|

{diff_cover-10.6.0 → diff_cover-11.0.0}/diff_cover/config_parser.py

@@ -1,17 +1,6 @@
 import abc
 import enum
-
-try:
-    import tomli as toml
-
-    _HAS_TOML = True
-except ImportError:  # pragma: no cover
-    try:
-        import tomllib as toml
-
-        _HAS_TOML = True
-    except ImportError:
-        _HAS_TOML = False
+import tomllib
 
 
 class Tool(enum.Enum):
@@ -42,11 +31,8 @@ class TOMLParser(ConfigParser):
         if not self._file_name.endswith(".toml"):
             return None
 
-        if not _HAS_TOML:
-            raise ParserError("No Toml lib installed")
-
         with open(self._file_name, "rb") as file_handle:
-            config = toml.load(file_handle)
+            config = tomllib.load(file_handle)
 
         config = config.get("tool", {}).get(self._section, {})
         if not config:

{diff_cover-10.6.0 → diff_cover-11.0.0}/diff_cover/diff_reporter.py

@@ -98,8 +98,16 @@ class BaseDiffReporter(ABC):
         if self._fnmatch(basename, exclude):
             return True
 
+        # A pattern that names a directory - "subdir/*", the shape the README
+        # uses for include patterns - matches neither the basename nor the
+        # absolute path, so it used to exclude nothing at all and said so
+        # nowhere. Match the path as the diff reports it, which is relative to
+        # the repository root.
+        if self._fnmatch(to_unix_path(path), exclude):
+            return True
+
         absolute_path = os.path.abspath(path)
-        return self._fnmatch(absolute_path, exclude)
+        return self._fnmatch(to_unix_path(absolute_path), exclude)
 
 
 class GitDiffReporter(BaseDiffReporter):

{diff_cover-10.6.0 → diff_cover-11.0.0}/diff_cover/git_diff.py

@@ -129,7 +129,7 @@ class GitDiffFileTool(GitDiffTool):
         Raises a `GitDiffError` if the file cannot be read.
         """
         try:
-            with open(self.diff_file_path, "r", encoding="utf-8") as file:
+            with open(self.diff_file_path, encoding="utf-8") as file:
                 return file.read()
         except OSError as e:
             error_message = (

{diff_cover-10.6.0 → diff_cover-11.0.0}/diff_cover/snippets.py

@@ -217,13 +217,20 @@ class Snippet:
         """
         Return a Terminal-friendly (with ANSI color sequences) representation of the snippet.
         """
-        formatter = TerminalFormatter(
-            linenos=True,
-            colorscheme=None,
-            linenostart=self._start_line,
+        # Pygments' TerminalFormatter ignores `linenostart` and always numbers
+        # from 1, so the snippet is rendered without line numbers and they are
+        # added here, in the same `0001: ` form, starting at the snippet's
+        # first line. See #283.
+        rendered = pygments.format(
+            self.src_tokens(), TerminalFormatter(colorscheme=None)
         )
-
-        return pygments.format(self.src_tokens(), formatter)
+        numbered = [
+            f"{line_number:04d}: {line}"
+            for line_number, line in enumerate(
+                rendered.split("\n"), start=self._start_line
+            )
+        ]
+        return "\n".join(numbered) + "\n"
 
     def src_tokens(self):
         """

{diff_cover-10.6.0 → diff_cover-11.0.0}/diff_cover/violationsreporters/base.py

@@ -1,6 +1,7 @@
 import copy
 import os
 import re
+import shlex
 import sys
 from abc import ABC, abstractmethod
 from collections import defaultdict, namedtuple
@@ -12,6 +13,15 @@ from diff_cover.util import to_unix_path
 Violation = namedtuple("Violation", "line, message")
 
 
+def split_options(options):
+    """Split quoted options without consuming backslashes in paths."""
+    lexer = shlex.shlex(options, posix=True)
+    lexer.whitespace_split = True
+    lexer.escape = ""
+    lexer.commenters = ""
+    return list(lexer)
+
+
 class QualityReporterError(Exception):
     """
     A quality reporter command produced an error.
@@ -174,8 +184,7 @@ class QualityReporter(BaseViolationReporter):
                 raise OSError(msg)
             command = copy.deepcopy(self.driver.command)
             if self.options:
-                for arg in self.options.split():
-                    command.append(arg)
+                command += split_options(self.options)
             command.append(relative_src_path.encode(sys.getfilesystemencoding()))
 
             stdout, stderr = execute(command, self.driver.exit_codes)

{diff_cover-10.6.0 → diff_cover-11.0.0}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "diff_cover"
-version = "10.6.0"
+version = "11.0.0"
 description = "Run coverage and linting reports on diffs"
 authors = [{ name = "See Contributors" }]
 license = "Apache-2.0"
 license-files = ["LICENSE", "NOTICE"]
 readme = "README.rst"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
@@ -14,11 +14,11 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Software Development :: Testing",
     "Topic :: Software Development :: Quality Assurance",
@@ -31,7 +31,8 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-toml = ["tomli>=1.2.1"]
+# Kept so existing `diff_cover[toml]` installs keep working; tomllib is stdlib on 3.11+
+toml = []
 
 [project.urls]
 Homepage = "https://github.com/Bachmann1234/diff-cover"
@@ -49,7 +50,7 @@ dev = [
     "pytest-xdist>=3.6.1,<4",
     "pycodestyle>=2.9.1",
     "flake8>=7.0.0",
-    "pyflakes>=3.3.2,<4",
+    "pyflakes>=3.3.2,<5",
     "pylint>=3.3.4,<5.0.0",
     "pydocstyle>=6.1.1,<7",
     "doc8==2.0.0",
@@ -68,7 +69,7 @@ include = ["diff_cover", "tests", "README.rst"]
 
 [tool.ruff]
 line-length = 88
-target-version = "py310"
+target-version = "py311"
 exclude = [
     ".venv",
     "tests/fixtures",

{diff_cover-10.6.0 → diff_cover-11.0.0}/tests/test_config_parser.py

@@ -1,6 +1,5 @@
 import pytest
 
-from diff_cover import config_parser
 from diff_cover.config_parser import ParserError, TOMLParser, Tool, get_config
 
 tools = pytest.mark.parametrize("tool", list(Tool))
@@ -12,13 +11,6 @@ class TestTOMLParser:
         parser = TOMLParser("myfile", tool)
         assert parser.parse() is None
 
-    @tools
-    def test_parse_but_no_tomli_installed(self, tool, mocker):
-        mocker.patch.object(config_parser, "_HAS_TOML", False)
-        parser = TOMLParser("myfile.toml", tool)
-        with pytest.raises(ParserError):
-            parser.parse()
-
     @pytest.mark.parametrize(
         "tool,content",
         [

{diff_cover-10.6.0 → diff_cover-11.0.0}/tests/test_diff_reporter.py

@@ -99,6 +99,32 @@ def test_name_include_untracked(git_diff):
             ["file1.py", "file3.py"],
             to_unix_paths(["subdir2/file2.py"]),
         ),
+        # exclude by a path pattern rather than a bare filename
+        (
+            [],
+            ["subdir1/*"],
+            to_unix_paths(["file3.py", "README.md", "subdir2/file2.py"]),
+        ),
+        # the same shape the README shows for include patterns
+        (
+            [],
+            ["subdir1/**"],
+            to_unix_paths(["file3.py", "README.md", "subdir2/file2.py"]),
+        ),
+        # a path pattern that matches nothing leaves every path in place
+        (
+            [],
+            ["subdir3/*"],
+            to_unix_paths(
+                ["file3.py", "README.md", "subdir1/file1.py", "subdir2/file2.py"]
+            ),
+        ),
+        # several path patterns at once
+        (
+            [],
+            ["subdir1/*", "subdir2/*"],
+            to_unix_paths(["file3.py", "README.md"]),
+        ),
     ],
 )
 def test_git_path_selection(

{diff_cover-10.6.0 → diff_cover-11.0.0}/tests/test_integration.py

@@ -216,20 +216,20 @@ class TestDiffCoverIntegration:
             == 0
         )
         output = capsys.readouterr().out
-        with open("add_console_report.txt", "r", encoding="utf-8") as f:
+        with open("add_console_report.txt", encoding="utf-8") as f:
             actual = f.read()
             assert actual in output
-        with open("add_html_report.html", "r", encoding="utf-8") as f:
+        with open("add_html_report.html", encoding="utf-8") as f:
             actual = clean_html(f.read(), clear_inline_css=True)
             # can't compare the output inside <head> since it changes
             # a lot so we just compare the body
             actual = actual[actual.find("</head>") :]
             assert len(actual) > 20
             assert actual in output
-        with open("add_json_report.json", "r", encoding="utf-8") as f:
+        with open("add_json_report.json", encoding="utf-8") as f:
             actual = json.dumps(json.loads(f.read()))
             assert actual in output
-        with open("add_markdown_report.md", "r", encoding="utf-8") as f:
+        with open("add_markdown_report.md", encoding="utf-8") as f:
             actual = f.read()
             assert actual in output
 

{diff_cover-10.6.0 → diff_cover-11.0.0}/tests/test_snippets.py

@@ -2,7 +2,7 @@
 
 """Test for diff_cover.snippets"""
 
-import os
+import contextlib
 
 import pytest
 from pygments.token import Token
@@ -135,12 +135,11 @@ def patch_path_tool(mocker):
 
 
 @pytest.fixture
-def switch_to_fixture_dir(request):
+def switch_to_fixture_dir():
     # Need to be in the fixture directory
     # so the source path is displayed correctly
-    os.chdir(fixture_path(""))
-    yield
-    os.chdir(request.config.invocation_dir)
+    with contextlib.chdir(fixture_path("")):
+        yield
 
 
 def test_style_defs():
@@ -364,6 +363,43 @@ def test_html_marks_covered_lines_with_nonzero_start_line():
     assert "hll" in rendered
 
 
+def test_terminal_numbers_lines_from_start_line():
+    """
+    The terminal snippet must be numbered from the snippet's first line,
+    as the HTML and Markdown ones are, not from 1. See #283.
+    """
+    src_tokens = [
+        (Token.Text, "Line 217\n"),
+        (Token.Text, "Line 218\n"),
+        (Token.Text, "Line 219\n"),
+    ]
+    snippet = Snippet(
+        src_tokens,
+        "test.txt",
+        start_line=217,
+        last_line=219,
+        violation_lines=[218],
+        lexer_name=None,
+    )
+
+    lines = snippet.terminal().splitlines()
+
+    assert lines[:3] == ["0217: Line 217", "0218: Line 218", "0219: Line 219"]
+
+
+def test_terminal_numbers_lines_from_one_for_a_snippet_at_the_top():
+    snippet = Snippet(
+        [(Token.Text, "first\n"), (Token.Text, "second\n")],
+        "test.txt",
+        start_line=1,
+        last_line=2,
+        violation_lines=[1],
+        lexer_name=None,
+    )
+
+    assert snippet.terminal().splitlines()[:2] == ["0001: first", "0002: second"]
+
+
 def test_end_range_on_violation(tmpfile):
     src_path = tmpfile(40)
 

{diff_cover-10.6.0 → diff_cover-11.0.0}/tests/test_violations_reporter.py

@@ -1278,6 +1278,32 @@ class TestLcovCoverageReporterTest:
 
 
 class TestPycodestyleQualityReporterTest:
+    @pytest.mark.parametrize(
+        "options, config",
+        [
+            ("--config='lint config.ini' --ignore='E501'", "lint config.ini"),
+            (
+                r"--config=C:\lint\config.ini --ignore='E501'",
+                r"C:\lint\config.ini",
+            ),
+        ],
+    )
+    def test_quality_quoted_options(self, mocker, options, config):
+        execute = mocker.patch.object(base, "execute", return_value=("", ""))
+        quality = QualityReporter(pycodestyle_driver, options=options)
+        quality.driver_tool_installed = True
+
+        assert quality.violations("file1.py") == []
+        execute.assert_called_once_with(
+            [
+                "pycodestyle",
+                f"--config={config}",
+                "--ignore=E501",
+                b"file1.py",
+            ],
+            [0, 1],
+        )
+
     def test_quality(self, mocker, process_patcher):
         # Patch the output of `pycodestyle`
         mocker.patch.object(Popen, "communicate")