Review comments

Author: spoorcc

dfetch/project/subproject.py

@@ -187,18 +187,21 @@ def _apply_patches(self, count: int = -1) -> list[str]:
     def _report_unavailable_version(
         self, reporters: Sequence[AbstractCheckReporter]
     ) -> None:
+        """Report that the wanted version is not available on the remote."""
         for reporter in reporters:
             reporter.unavailable_project_version(self.__project, self.wanted_version)
 
     def _report_unfetched_project(
         self, reporters: Sequence[AbstractCheckReporter], latest_version: Version
     ) -> None:
+        """Report that the project is not fetched yet."""
         for reporter in reporters:
             reporter.unfetched_project(
                 self.__project, self.wanted_version, latest_version
             )
 
     def _report_local_changes(self, reporters: Sequence[AbstractCheckReporter]) -> None:
+        """Report that there are local changes."""
         for reporter in reporters:
             reporter.local_changes(self.__project)
 

dfetch/reporting/sbom_reporter.py

@@ -132,7 +132,7 @@
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version as pkg_version
 
-from cyclonedx.builder.this import this_component as cdx_lib_component
+from cyclonedx.contrib.this.builders import this_component as cdx_lib_component
 from cyclonedx.model import (
     AttachedText,
     Encoding,

dfetch/vcs/git.py

@@ -450,7 +450,12 @@ def _apply_move(chosen: Path, repo_root: Path, remote: str) -> None:
             return
         parts = chosen.relative_to(repo_root).parts
         if parts:
-            safe_rm(repo_root / parts[0], within=repo_root)
+            try:
+                safe_rm(repo_root / parts[0], within=repo_root)
+            except FileNotFoundError:
+                logger.debug(
+                    f"Nothing left to remove at '{repo_root / parts[0]}' after moving '{chosen}' for '{remote}'"
+                )
 
     @staticmethod
     def _move_src_folder_up(remote: str, src: str) -> None:

tests/test_report.py

@@ -174,7 +174,9 @@ def test_multiple_files_partitioned_correctly(self, tmp_path):
             "COPYING": bad_guess,
         }
 
-        with patch("dfetch.commands.report.glob.glob", return_value=["LICENSE", "COPYING"]):
+        with patch(
+            "dfetch.commands.report.glob.glob", return_value=["LICENSE", "COPYING"]
+        ):
             with patch("dfetch.commands.report.is_license_file", return_value=True):
                 with patch(
                     "dfetch.commands.report.guess_license_in_file",
@@ -195,4 +197,4 @@ def test_multiple_files_partitioned_correctly(self, tmp_path):
 
 def test_license_probability_threshold_value():
     """Threshold must be 0.80 as documented."""
-    assert LICENSE_PROBABILITY_THRESHOLD == 0.80
+    assert LICENSE_PROBABILITY_THRESHOLD == 0.80

tests/test_stdout_reporter.py

@@ -102,9 +102,7 @@ def test_add_project_prints_multiple_licenses_comma_separated():
         trove_classifier=None,
         probability=0.92,
     )
-    scan = LicenseScanResult(
-        identified=[lic1, lic2], was_scanned=True, threshold=0.80
-    )
+    scan = LicenseScanResult(identified=[lic1, lic2], was_scanned=True, threshold=0.80)
 
     meta = _make_metadata()
     with patch(
@@ -182,4 +180,4 @@ def test_add_project_unclassified_files_not_shown_in_stdout():
 def test_dump_to_file_returns_false():
     """StdoutReporter.dump_to_file should always return False (no file written)."""
     reporter = StdoutReporter(_make_manifest())
-    assert reporter.dump_to_file("report.json") is False
+    assert reporter.dump_to_file("report.json") is False