diff-cover 10.2.0__tar.gz → 10.2.1__tar.gz

{diff_cover-10.2.0 → diff_cover-10.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: diff_cover
-Version: 10.2.0
+Version: 10.2.1
 Summary: Run coverage and linting reports on diffs
 License: Apache-2.0
 Author: See Contributors

{diff_cover-10.2.0 → diff_cover-10.2.1}/diff_cover/diff_cover_tool.py

@@ -312,7 +312,7 @@ def generate_coverage_report(
 
 
 def handle_old_format(description, argv):
-    parser = argparse.ArgumentParser(description=description)
+    parser = argparse.ArgumentParser(description=description, add_help=False)
     arg_html = parser.add_argument("--html-report", type=str)
     arg_json = parser.add_argument("--json-report", type=str)
     arg_markdown = parser.add_argument("--markdown-report", type=str)

{diff_cover-10.2.0 → diff_cover-10.2.1}/diff_cover/git_diff.py

@@ -72,14 +72,10 @@ class GitDiffTool:
             )[0]
         except CommandError as e:
             if "unknown revision" in str(e):
-                raise ValueError(
-                    dedent(
-                        f"""
+                raise ValueError(dedent(f"""
                         Could not find the branch to compare to. Does '{compare_branch}' exist?
                         the `--compare-branch` argument allows you to set a different branch.
-                    """
-                    )
-                ) from e
+                    """)) from e
             raise
 
     def diff_unstaged(self):

{diff_cover-10.2.0 → diff_cover-10.2.1}/diff_cover/violationsreporters/violations_reporter.py

@@ -831,7 +831,7 @@ class CppcheckDriver(QualityDriver):
                 # Ignore any line that isn't matched
                 # (for example, snippets from the source code)
                 if match is not None:
-                    (cppcheck_src_path, line_number, message) = match.groups()
+                    cppcheck_src_path, line_number, message = match.groups()
 
                     violation = Violation(int(line_number), message)
                     violations_dict[util.to_unix_path(cppcheck_src_path)].append(

{diff_cover-10.2.0 → diff_cover-10.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "diff_cover"
-version = "10.2.0"
+version = "10.2.1"
 description = "Run coverage and linting reports on diffs"
 authors = ["See Contributors"]
 homepage = "https://github.com/Bachmann1234/diff-cover"
@@ -58,10 +58,10 @@ pyflakes = "^3.3.2"
 pylint = ">=3.3.4,<5.0.0"
 pylint-pytest = "^1.1.8"
 pydocstyle = "^6.1.1"
-black = "^25.1.0"
-isort = "^6.0.1"
+black = "^26.1.0"
+isort = ">=6.0.1,<9.0.0"
 doc8 = "2.0.0"
-ruff = ">=0.11.10,<0.15.0"
+ruff = ">=0.11.10,<0.16.0"
 
 [tool.poetry.extras]
 toml = ["tomli"]

{diff_cover-10.2.0 → diff_cover-10.2.1}/tests/test_diff_reporter.py

@@ -246,8 +246,7 @@ def test_ignore_lines_outside_src(diff, git_diff):
 def test_one_line_file(diff, git_diff):
     # Files with only one line have a special format
     # in which the "length" part of the hunk is not specified
-    diff_str = dedent(
-        """
+    diff_str = dedent("""
         diff --git a/diff_cover/one_line.txt b/diff_cover/one_line.txt
         index 0867e73..9daeafb 100644
         --- a/diff_cover/one_line.txt
@@ -256,8 +255,7 @@ def test_one_line_file(diff, git_diff):
         test
         -test
         -test
-        """
-    ).strip()
+        """).strip()
 
     # Configure the git diff output
     _set_git_diff_output(diff, git_diff, diff_str, "", "")
@@ -291,8 +289,7 @@ def test_git_deleted_lines(diff, git_diff):
 def test_git_unicode_filename(diff, git_diff):
     # Filenames with unicode characters have double quotes surrounding them
     # in the git diff output.
-    diff_str = dedent(
-        """
+    diff_str = dedent("""
         diff --git "a/unic\303\270\342\210\202e\314\201.txt" "b/unic\303\270\342\210\202e\314\201.txt"
         new file mode 100644
         index 0000000..248ebea
@@ -302,8 +299,7 @@ def test_git_unicode_filename(diff, git_diff):
         +μῆνιν ἄειδε θεὰ Πηληϊάδεω Ἀχιλῆος
         +οὐλομένην, ἣ μυρί᾽ Ἀχαιοῖς ἄλγε᾽ ἔθηκε,
         +πολλὰς δ᾽ ἰφθίμους ψυχὰς Ἄϊδι προΐαψεν
-        """
-    ).strip()
+        """).strip()
 
     _set_git_diff_output(diff, git_diff, diff_str, "", "")
     # Get the lines changed in the diff
@@ -429,28 +425,22 @@ def test_git_diff_error(
     diff,
     git_diff,
 ):
-    invalid_hunk_str = dedent(
-        """
+    invalid_hunk_str = dedent("""
         diff --git a/subdir/file1.py b/subdir/file1.py
         @@ invalid @@ Text
-    """
-    ).strip()
+    """).strip()
 
     no_src_line_str = "@@ -33,10 +34,13 @@ Text"
 
-    non_numeric_lines = dedent(
-        """
+    non_numeric_lines = dedent("""
         diff --git a/subdir/file1.py b/subdir/file1.py
         @@ -1,2 +a,b @@
-    """
-    ).strip()
+    """).strip()
 
-    missing_line_num = dedent(
-        """
+    missing_line_num = dedent("""
         diff --git a/subdir/file1.py b/subdir/file1.py
         @@ -1,2 +  @@
-    """
-    ).strip()
+    """).strip()
 
     missing_src_str = "diff --git "
 
@@ -478,16 +468,14 @@ def test_git_diff_error(
 
 def test_plus_sign_in_hunk_bug(diff, git_diff):
     # This was a bug that caused a parse error
-    diff_str = dedent(
-        """
+    diff_str = dedent("""
         diff --git a/file.py b/file.py
         @@ -16,16 +16,7 @@ 1 + 2
         + test
         + test
         + test
         + test
-        """
-    )
+        """)
 
     _set_git_diff_output(diff, git_diff, diff_str, "", "")
 
@@ -498,16 +486,14 @@ def test_plus_sign_in_hunk_bug(diff, git_diff):
 def test_terminating_chars_in_hunk(diff, git_diff):
     # Check what happens when there's an @@ symbol after the
     # first terminating @@ symbol
-    diff_str = dedent(
-        """
+    diff_str = dedent("""
         diff --git a/file.py b/file.py
         @@ -16,16 +16,7 @@ and another +23,2 @@ symbol
         + test
         + test
         + test
         + test
-        """
-    )
+        """)
 
     _set_git_diff_output(diff, git_diff, diff_str, "", "")
 
@@ -518,8 +504,7 @@ def test_terminating_chars_in_hunk(diff, git_diff):
 def test_merge_conflict_diff(diff, git_diff):
     # Handle different git diff format when in the middle
     # of a merge conflict
-    diff_str = dedent(
-        """
+    diff_str = dedent("""
         diff --cc subdir/src.py
         index d2034c0,e594d54..0000000
         diff --cc subdir/src.py
@@ -531,8 +516,7 @@ def test_merge_conflict_diff(diff, git_diff):
         ++<<<<<< HEAD
         + test
         ++=======
-    """
-    )
+    """)
 
     _set_git_diff_output(diff, git_diff, diff_str, "", "")
 

{diff_cover-10.2.0 → diff_cover-10.2.1}/tests/test_integration.py

@@ -2,6 +2,7 @@
 # pylint: disable=use-implicit-booleaness-not-comparison
 
 """High-level integration tests of diff-cover tool."""
+
 import json
 import os
 import os.path
@@ -383,8 +384,7 @@ class TestDiffCoverIntegration:
         mocker.patch.object(GitPathTool, "_git_root", return_value="/code/samplediff/")
         patch_git_command.set_stdout("git_diff_dotnet.txt")
         assert runbin(["dotnet_coverage.xml"]) == 0
-        expected = textwrap.dedent(
-            f"""\
+        expected = textwrap.dedent(f"""\
             -------------
             Diff Coverage
             Diff: origin/main...HEAD, staged and unstaged changes
@@ -395,8 +395,7 @@ class TestDiffCoverIntegration:
             Missing: 3 lines
             Coverage: 0%
             -------------
-            """
-        )
+            """)
         assert capsys.readouterr().out.strip() == expected.strip()
 
     def test_unicode_html(self, runbin, patch_git_command):
@@ -469,22 +468,19 @@ class TestDiffCoverIntegration:
         assert (
             runbin(["coverage.xml", "--format", "github-annotations:notice", "-q"]) == 0
         )
-        expected = textwrap.dedent(
-            """\
+        expected = textwrap.dedent("""\
         ::notice file=test_src.txt,line=2,title=Missing Coverage::Line 2 missing coverage
         ::notice file=test_src.txt,line=4,title=Missing Coverage::Line 4 missing coverage
         ::notice file=test_src.txt,line=6,title=Missing Coverage::Line 6 missing coverage
         ::notice file=test_src.txt,line=8,title=Missing Coverage::Line 8 missing coverage
         ::notice file=test_src.txt,line=10,title=Missing Coverage::Line 10 missing coverage
-        """
-        )
+        """)
         assert capsys.readouterr().out == expected
 
     @pytest.mark.usefixtures("patch_git_command")
     def test_github_fully_covered(self, runbin, capsys):
         assert runbin(["coverage2.xml", "--format", "github-annotations:notice"]) == 0
-        expected = textwrap.dedent(
-            """\
+        expected = textwrap.dedent("""\
         -------------
         Diff Coverage
         Diff: origin/main...HEAD, staged and unstaged changes
@@ -492,15 +488,13 @@ class TestDiffCoverIntegration:
         No lines with coverage information in this diff.
         -------------
 
-        """
-        )
+        """)
         assert capsys.readouterr().out == expected
 
     def test_github_empty_diff(self, runbin, patch_git_command, capsys):
         patch_git_command.set_stdout("")
         assert runbin(["coverage.xml", "--format", "github-annotations:notice"]) == 0
-        expected = textwrap.dedent(
-            """\
+        expected = textwrap.dedent("""\
         -------------
         Diff Coverage
         Diff: origin/main...HEAD, staged and unstaged changes
@@ -508,8 +502,7 @@ class TestDiffCoverIntegration:
         No lines with coverage information in this diff.
         -------------
 
-        """
-        )
+        """)
         assert capsys.readouterr().out == expected
 
     def test_real_world_cpp_lcov_coverage(self, runbin, patch_git_command, capsys):

{diff_cover-10.2.0 → diff_cover-10.2.1}/tests/test_java_violations_reporter.py

@@ -62,14 +62,10 @@ class TestCheckstyleQualityReporterTest:
         # Patch the output of `checkstyle`
         process_patcher(
             (
-                dedent(
-                    """
+                dedent("""
             [WARN] ../new_file.java:1:1: Line contains a tab character.
             [WARN] ../new_file.java:13: 'if' construct must use '{}'s.
-            """
-                )
-                .strip()
-                .encode("ascii"),
+            """).strip().encode("ascii"),
                 "",
             )
         )
@@ -127,8 +123,7 @@ class TestCheckstyleXmlQualityReporterTest:
         # Patch the output of `checkstyle`
         process_patcher(
             (
-                dedent(
-                    """
+                dedent("""
             <?xml version="1.0" encoding="UTF-8"?>
             <checkstyle version="8.0">
                 <file name="file1.java">
@@ -144,10 +139,7 @@ class TestCheckstyleXmlQualityReporterTest:
                     <error line="100" severity="error" message="Access to a protected member"/>
                 </file>
             </checkstyle>
-            """
-                )
-                .strip()
-                .encode("ascii"),
+            """).strip().encode("ascii"),
                 "",
             )
         )
@@ -187,16 +179,14 @@ class TestCheckstyleXmlQualityReporterTest:
         # Patch the output stderr/stdout and returncode of `checkstyle`
         process_patcher(
             (
-                dedent(
-                    """
+                dedent("""
             <?xml version="1.0" encoding="UTF-8"?>
             <checkstyle version="8.0">
                 <file name="file1.java">
                     <error line="1" severity="error" message="Missing docstring"/>
                 </file>
             </checkstyle>
-            """
-                ),
+            """),
                 b"oops",
             ),
             status_code=1,
@@ -216,9 +206,7 @@ class TestCheckstyleXmlQualityReporterTest:
         # When the user provides us with a pre-generated checkstyle report
         # then use that instead of calling checkstyle directly.
         checkstyle_reports = [
-            BytesIO(
-                dedent(
-                    """
+            BytesIO(dedent("""
                 <?xml version="1.0" encoding="UTF-8"?>
                 <checkstyle version="8.0">
                     <file name="path/to/file.java">
@@ -231,14 +219,8 @@ class TestCheckstyleXmlQualityReporterTest:
                         <error line="259" severity="error" message="Invalid name '' for type variable (should match [a-z_][a-z0-9_]{2,30}$)"/>
                     </file>
                 </checkstyle>
-            """
-                )
-                .strip()
-                .encode("utf-8")
-            ),
-            BytesIO(
-                dedent(
-                    """
+            """).strip().encode("utf-8")),
+            BytesIO(dedent("""
             <?xml version="1.0" encoding="UTF-8"?>
             <checkstyle version="8.0">
                 <file name="path/to/file.java">
@@ -248,11 +230,7 @@ class TestCheckstyleXmlQualityReporterTest:
                     <error line="183" severity="error" message="Missing docstring"/>
                 </file>
             </checkstyle>
-            """
-                )
-                .strip()
-                .encode("utf-8")
-            ),
+            """).strip().encode("utf-8")),
         ]
 
         # Generate the violation report
@@ -307,9 +285,7 @@ class TestFindbugsQualityReporterTest:
         # When the user provides us with a pre-generated findbugs report
         # then use that instead of calling findbugs directly.
         findbugs_reports = [
-            BytesIO(
-                dedent(
-                    """
+            BytesIO(dedent("""
                 <?xml version="1.0" encoding="UTF-8"?>
                 <BugCollection sequence="0" release="" analysisTimestamp="1512755361404" version="3.0.1" timestamp="1512755226000">
                     <BugInstance instanceOccurrenceNum="0" instanceHash="1967bf8c4d25c6b964f30356014aa9fb" rank="20" abbrev="Dm" category="I18N" priority="3" type="DM_CONVERT_CASE" instanceOccurrenceMax="0">
@@ -333,14 +309,8 @@ class TestFindbugsQualityReporterTest:
                         </SourceLine>
                     </BugInstance>
                 </BugCollection>
-            """
-                )
-                .strip()
-                .encode("utf-8")
-            ),
-            BytesIO(
-                dedent(
-                    """
+            """).strip().encode("utf-8")),
+            BytesIO(dedent("""
                 <?xml version="1.0" encoding="UTF-8"?>
                 <BugCollection sequence="0" release="" analysisTimestamp="1512755361404" version="3.0.1" timestamp="1512755226000">
                     <BugInstance instanceOccurrenceNum="0" instanceHash="1967bf8c4d25c6b964f30356014aa9fb" rank="20" abbrev="Dm" category="I18N" priority="3" type="DM_CONVERT_CASE" instanceOccurrenceMax="0">
@@ -364,15 +334,9 @@ class TestFindbugsQualityReporterTest:
                         </SourceLine>
                     </BugInstance>
                 </BugCollection>
-            """
-                )
-                .strip()
-                .encode("utf-8")
-            ),
+            """).strip().encode("utf-8")),
             # this is a violation which is not bounded to a specific line. We'll skip those
-            BytesIO(
-                dedent(
-                    """
+            BytesIO(dedent("""
                 <?xml version="1.0" encoding="UTF-8"?>
                 <BugCollection sequence="0" release="" analysisTimestamp="1512755361404" version="3.0.1" timestamp="1512755226000">
                     <BugInstance instanceOccurrenceNum="0" instanceHash="2820338ec68e2e75a81848c95d31167f" rank="19" abbrev="Se" category="BAD_PRACTICE" priority="3" type="SE_BAD_FIELD" instanceOccurrenceMax="0">
@@ -383,11 +347,7 @@ class TestFindbugsQualityReporterTest:
                         </SourceLine>
                     </BugInstance>
                 </BugCollection>
-            """
-                )
-                .strip()
-                .encode("utf-8")
-            ),
+            """).strip().encode("utf-8")),
         ]
 
         # Generate the violation report
@@ -441,10 +401,7 @@ class TestPmdXmlQualityReporterTest:
     def test_quality_pregenerated_report(self):
         # When the user provides us with a pre-generated findbugs report
         # then use that instead of calling findbugs directly.
-        pmd_reports = [
-            BytesIO(
-                dedent(
-                    """
+        pmd_reports = [BytesIO(dedent("""
             <?xml version="1.0" encoding="UTF-8"?>
             <pmd version="5.6.1" timestamp="2019-06-24T15:47:13.429">
             <file name="path/to/file.java">
@@ -458,12 +415,7 @@ class TestPmdXmlQualityReporterTest:
             </violation>
             </file>
             </pmd>
-            """
-                )
-                .strip()
-                .encode("utf-8")
-            )
-        ]
+            """).strip().encode("utf-8"))]
 
         pmd_xml_driver = PmdXmlDriver()
         # Generate the violation report

{diff_cover-10.2.0 → diff_cover-10.2.1}/tests/test_report_generator.py

@@ -368,8 +368,7 @@ class TestStringReportGenerator(BaseReportGeneratorTest):
     @pytest.mark.usefixtures("use_default_values")
     def test_generate_report(self):
         # Verify that we got the expected string
-        expected = dedent(
-            """
+        expected = dedent("""
         -------------
         Diff Coverage
         Diff: main
@@ -381,8 +380,7 @@ class TestStringReportGenerator(BaseReportGeneratorTest):
         Missing: 4 lines
         Coverage: 66%
         -------------
-        """
-        ).strip()
+        """).strip()
 
         self.assert_report(expected)
 
@@ -395,8 +393,7 @@ class TestStringReportGenerator(BaseReportGeneratorTest):
         coverage_violations.update({"file.py": []})
         coverage_measured_lines.update({"file.py": [2]})
 
-        expected = dedent(
-            """
+        expected = dedent("""
         -------------
         Diff Coverage
         Diff: main
@@ -407,8 +404,7 @@ class TestStringReportGenerator(BaseReportGeneratorTest):
         Missing: 0 lines
         Coverage: 100%
         -------------
-        """
-        ).strip()
+        """).strip()
 
         self.assert_report(expected)
 
@@ -416,16 +412,14 @@ class TestStringReportGenerator(BaseReportGeneratorTest):
         # Have the dependencies return an empty report
         # (this is the default)
 
-        expected = dedent(
-            """
+        expected = dedent("""
         -------------
         Diff Coverage
         Diff: main
         -------------
         No lines with coverage information in this diff.
         -------------
-        """
-        ).strip()
+        """).strip()
 
         self.assert_report(expected)
 
@@ -448,12 +442,10 @@ class TestGitHubAnnotationsReportGenerator(BaseReportGeneratorTest):
     @pytest.mark.usefixtures("use_default_values")
     def test_generate_report(self):
         # Verify that we got the expected string
-        expected = dedent(
-            """
+        expected = dedent("""
         ::warning file=file1.py,line=10,endLine=11,title=Missing Coverage::Line 10-11 missing coverage
         ::warning file=subdir/file2.py,line=10,endLine=11,title=Missing Coverage::Line 10-11 missing coverage
-        """
-        ).strip()
+        """).strip()
 
         self.assert_report(expected)
 
@@ -466,11 +458,9 @@ class TestGitHubAnnotationsReportGenerator(BaseReportGeneratorTest):
         coverage_measured_lines.update({"file.py": [2]})
 
         # Verify that we got the expected string
-        expected = dedent(
-            """
+        expected = dedent("""
         ::warning file=file.py,line=10,title=Missing Coverage::Line 10 missing coverage
-        """
-        ).strip()
+        """).strip()
 
         self.assert_report(expected)
 
@@ -549,8 +539,7 @@ class TestMarkdownReportGenerator(BaseReportGeneratorTest):
         # Generate a default report
 
         # Verify that we got the expected string
-        expected = dedent(
-            """
+        expected = dedent("""
         # Diff Coverage
         ## Diff: main
 
@@ -562,8 +551,7 @@ class TestMarkdownReportGenerator(BaseReportGeneratorTest):
         - **Total**: 12 lines
         - **Missing**: 4 lines
         - **Coverage**: 66%
-        """
-        ).strip()
+        """).strip()
 
         self.assert_report(expected)
 
@@ -576,8 +564,7 @@ class TestMarkdownReportGenerator(BaseReportGeneratorTest):
         coverage_violations.update({"file.py": []})
         coverage_measured_lines.update({"file.py": [2]})
 
-        expected = dedent(
-            """
+        expected = dedent("""
         # Diff Coverage
         ## Diff: main
 
@@ -588,8 +575,7 @@ class TestMarkdownReportGenerator(BaseReportGeneratorTest):
         - **Total**: 1 line
         - **Missing**: 0 lines
         - **Coverage**: 100%
-        """
-        ).strip()
+        """).strip()
 
         self.assert_report(expected)
 
@@ -597,14 +583,12 @@ class TestMarkdownReportGenerator(BaseReportGeneratorTest):
         # Have the dependencies return an empty report
         # (this is the default)
 
-        expected = dedent(
-            """
+        expected = dedent("""
         # Diff Coverage
         ## Diff: main
 
         No lines with coverage information in this diff.
-        """
-        ).strip()
+        """).strip()
 
         self.assert_report(expected)