Merge pull request #172 from opossum-tool/refactor-use-pydantic-for-writing

Refactor use pydantic for writing

Author: abraemer

pyproject.toml

@@ -12,6 +12,7 @@ dependencies = [
     "spdx-tools>=0.8.3,<0.9",
     "networkx~=3.4",
     "click>=8.1.8,<9",
+    "pydantic>=2.10.5",
 ]
 
 [project.urls]

src/opossum_lib/opossum/opossum_file.py

@@ -4,10 +4,12 @@
 from __future__ import annotations
 
 from copy import deepcopy
-from dataclasses import dataclass, field
+from dataclasses import field
 from enum import Enum, auto
 from typing import Literal
 
+from pydantic.dataclasses import dataclass
+
 OpossumPackageIdentifier = str
 ResourcePath = str
 

tests/test_opossum/test_merge.py

@@ -203,15 +203,12 @@ def test_merge_dicts_without_duplicates_type_error(
         _merge_dicts_without_duplicates(dicts)
 
 
-@mock.patch("opossum_lib.opossum.opossum_file.Resource")
-@mock.patch("opossum_lib.opossum.opossum_file.OpossumPackage")
-def test_expand_opossum_package_identifier(
-    opossum_package: OpossumPackage, resource: Resource
-) -> None:
+def test_expand_opossum_package_identifier() -> None:
+    opossum_package = OpossumPackage(SourceInfo("source-info"))
     opossum_information_expanded = expand_opossum_package_identifier(
         OpossumInformation(
             Metadata("project-id", "2022-03-02", "project title"),
-            resources=resource,
+            resources=Resource(ResourceType.FILE, {}),
             externalAttributions={"SPDXRef-Package": opossum_package},
             resourcesToAttributions={"/path/to/resource": ["SPDXRef-Package"]},
             attributionBreakpoints=[],