wip

Signed-off-by: Jan Kowalleck <[email protected]>
CycloneDX · Jun 15, 2023 · 4cd9b5f · 4cd9b5f
1 parent 4daad47
commit 4cd9b5f
Show file tree

Hide file tree

Showing 92 changed files with 247 additions and 349 deletions.
diff --git a/cyclonedx/model/component.py b/cyclonedx/model/component.py
@@ -1033,7 +1033,7 @@ def hashes(self, hashes: Iterable[HashType]) -> None:
     @serializable.view(SchemaVersion1Dot2)
     @serializable.view(SchemaVersion1Dot3)
     @serializable.view(SchemaVersion1Dot4)
-    @serializable.xml_array(serializable.XmlArraySerializationType.FLAT, 'licenses')
+    # @serializable.xml_array(serializable.XmlArraySerializationType.NESTED, '')
     @serializable.xml_sequence(10)
     def licenses(self) -> "SortedSet[LicenseChoice]":
         """

diff --git a/cyclonedx/serialization/__init__.py b/cyclonedx/serialization/__init__.py
@@ -98,3 +98,4 @@ def serialize(cls, o: object) -> List[LicenseChoice]:
     @classmethod
     def deserialize(cls, o: object) -> List[LicenseChoice]:
         raise NotImplementedError
+        return [LicenseChoice.from_json(data) for data in o]
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -49,7 +49,7 @@ keywords = [
 python = "^3.7"
 importlib-metadata = { version = "^3.4.0", python = "<3.8" }
 packageurl-python = ">= 0.11"
-py-serializable = "^0.11.1"
+py-serializable = "^0.12"
 sortedcontainers = "^2.4.0"
 
 [tool.poetry.dev-dependencies]