Use Package instead of PoetryDependency, as group info already given, which makes for easier comparisons

Author: ArBridgeman

exasol/toolbox/util/dependencies/licenses.py

@@ -8,9 +8,6 @@
 
 from pydantic import field_validator
 
-from exasol.toolbox.util.dependencies.poetry_dependencies import (
-    PoetryDependency,
-)
 from exasol.toolbox.util.dependencies.shared_models import Package
 
 LICENSE_MAPPING_TO_ABBREVIATION = {
@@ -127,7 +124,7 @@ def heading():
 
     def dependency(
         group: str,
-        group_packages: list[PoetryDependency],
+        group_packages: list[Package],
         packages: list[PackageLicense],
     ) -> str:
         def _header(_group: str):
@@ -138,7 +135,7 @@ def _header(_group: str):
             return text
 
         def _rows(
-            _group_packages: list[PoetryDependency], _packages: list[PackageLicense]
+            _group_packages: list[Package], _packages: list[PackageLicense]
         ) -> str:
             text = ""
             for package in _group_packages:

exasol/toolbox/util/dependencies/poetry_dependencies.py

@@ -26,12 +26,6 @@ class Config:
 TRANSITIVE_GROUP = PoetryGroup(name="transitive", toml_section=None)
 
 
-class PoetryDependency(Package):
-    name: str
-    version: str
-    group: PoetryGroup
-
-
 class PoetryToml(BaseModel):
     working_directory: Path
 
@@ -86,38 +80,39 @@ class PoetryDependencies(BaseModel):
     working_directory: Path
 
     @staticmethod
-    def _extract_from_line(line: str, group: PoetryGroup) -> PoetryDependency:
+    def _extract_from_line(line: str) -> Package:
         pattern = r"\s+(\d+(?:\.\d+)*)\s+"
         match = re.split(pattern, line)
-        return PoetryDependency(name=match[0], version=match[1], group=group)
+        return Package(name=match[0], version=match[1])
 
-    def _extract_from_poetry_show(
-        self, output_text: str, group: PoetryGroup
-    ) -> list[PoetryDependency]:
-        return [
-            self._extract_from_line(line, group=group)
-            for line in output_text.splitlines()
-        ]
+    def _extract_from_poetry_show(self, output_text: str) -> list[Package]:
+        return [self._extract_from_line(line) for line in output_text.splitlines()]
 
     @property
-    def direct_dependencies(self) -> dict[str, list[PoetryDependency]]:
+    def direct_dependencies(self) -> dict[str, list[Package]]:
         dependencies = {}
         for group in self.groups:
             command = ("poetry", "show", "--top-level", f"--only={group.name}")
             output = subprocess.run(
-                command, capture_output=True, text=True, cwd=self.working_directory, check=True
-            )
-            result = self._extract_from_poetry_show(
-                output_text=output.stdout, group=group
+                command,
+                capture_output=True,
+                text=True,
+                cwd=self.working_directory,
+                check=True,
             )
+            result = self._extract_from_poetry_show(output_text=output.stdout)
             dependencies[group.name] = result
         return dependencies
 
     @property
-    def all_dependencies(self) -> dict[str, list[PoetryDependency]]:
+    def all_dependencies(self) -> dict[str, list[Package]]:
         command = ("poetry", "show")
         output = subprocess.run(
-            command, capture_output=True, text=True, cwd=self.working_directory, check=True
+            command,
+            capture_output=True,
+            text=True,
+            cwd=self.working_directory,
+            check=True,
         )
 
         direct_dependencies = self.direct_dependencies.copy()
@@ -128,7 +123,7 @@ def all_dependencies(self) -> dict[str, list[PoetryDependency]]:
             for dep in group_list
         }
         for line in output.stdout.splitlines():
-            dep = self._extract_from_line(line=line, group=TRANSITIVE_GROUP)
+            dep = self._extract_from_line(line=line)
             if dep.name not in names_direct_dependencies:
                 transitive_dependencies.append(dep)
 

test/unit/util/dependencies/licenses_test.py

@@ -8,9 +8,9 @@
     packages_to_markdown,
 )
 from exasol.toolbox.util.dependencies.poetry_dependencies import (
-    PoetryDependency,
     PoetryGroup,
 )
+from exasol.toolbox.util.dependencies.shared_models import Package
 
 MAIN_GROUP = PoetryGroup(name="main", toml_section="project.dependencies")
 DEV_GROUP = PoetryGroup(name="dev", toml_section="tool.poetry.group.dev.dependencies")
@@ -112,18 +112,10 @@ def test_packages_from_json(json, expected):
         (
             {
                 MAIN_GROUP.name: [
-                    PoetryDependency(
-                        name="package1", version="version1", group=MAIN_GROUP
-                    ),
-                    PoetryDependency(
-                        name="package3", version="version3", group=MAIN_GROUP
-                    ),
-                ],
-                DEV_GROUP.name: [
-                    PoetryDependency(
-                        name="package2", version="version2", group=DEV_GROUP
-                    )
+                    Package(name="package1", version="version1"),
+                    Package(name="package3", version="version3"),
                 ],
+                DEV_GROUP.name: [Package(name="package2", version="version2")],
             },
             [
                 PackageLicense(

test/unit/util/dependencies/poetry_dependencies_test.py

@@ -4,20 +4,20 @@
 
 from exasol.toolbox.util.dependencies.poetry_dependencies import (
     PoetryDependencies,
-    PoetryDependency,
     PoetryGroup,
     PoetryToml,
 )
+from exasol.toolbox.util.dependencies.shared_models import Package
 
 MAIN_GROUP = PoetryGroup(name="main", toml_section="project.dependencies")
 DEV_GROUP = PoetryGroup(name="dev", toml_section="tool.poetry.group.dev.dependencies")
 ANALYSIS_GROUP = PoetryGroup(
     name="analysis", toml_section="tool.poetry.group.analysis.dependencies"
 )
 
-PYLINT = PoetryDependency(name="pylint", version="3.3.7", group=MAIN_GROUP)
-ISORT = PoetryDependency(name="isort", version="6.0.1", group=DEV_GROUP)
-BLACK = PoetryDependency(name="black", version="25.1.0", group=ANALYSIS_GROUP)
+PYLINT = Package(name="pylint", version="3.3.7")
+ISORT = Package(name="isort", version="6.0.1")
+BLACK = Package(name="black", version="25.1.0")
 
 DIRECT_DEPENDENCIES = {
     MAIN_GROUP.name: [PYLINT],
@@ -85,20 +85,20 @@ class TestPoetryDependencies:
         [
             (
                 "coverage                      7.8.0     Code coverage measurement for Python",
-                PoetryDependency(name="coverage", version="7.8.0", group=MAIN_GROUP),
+                Package(name="coverage", version="7.8.0"),
             ),
             (
                 "furo                          2024.8.6  A clean customisable Sphinx documentation theme.",
-                PoetryDependency(name="furo", version="2024.8.6", group=MAIN_GROUP),
+                Package(name="furo", version="2024.8.6"),
             ),
             (
                 "import-linter                 2.3       Enforces rules for the imports within and between Python packages.",
-                PoetryDependency(name="import-linter", version="2.3", group=MAIN_GROUP),
+                Package(name="import-linter", version="2.3"),
             ),
         ],
     )
     def test_extract_from_line(line, expected):
-        result = PoetryDependencies._extract_from_line(line=line, group=MAIN_GROUP)
+        result = PoetryDependencies._extract_from_line(line=line)
         assert result == expected
 
     @staticmethod