hoppr-cyclonedx-models 0.5.5__tar.gz → 0.6.2__tar.gz

{hoppr_cyclonedx_models-0.5.5 → hoppr_cyclonedx_models-0.6.2}/PKG-INFO

@@ -1,13 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hoppr-cyclonedx-models
-Version: 0.5.5
+Version: 0.6.2
 Summary: CycloneDX Pydantic models for easy use in your Python project.
-Home-page: https://gitlab.com/hoppr/hoppr-cyclonedx-models
 License: MIT
+License-File: LICENSE
 Keywords: pydantic,models,cyclonedx,software bill of materials
 Author: LMCO Open Source
 Author-email: open.source@lmco.com
-Requires-Python: >=3.7.2,<4.0.0
+Requires-Python: >=3.8.0,<4.0.0
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Framework :: Pydantic
 Classifier: Framework :: Pytest
@@ -19,9 +19,12 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Code Generators
 Classifier: Typing :: Typed
 Requires-Dist: pydantic[email] (>=1.10.2,<2.0.0)
+Requires-Dist: typing-extensions (>=4.7.1,<5.0.0)
 Project-URL: Repository, https://gitlab.com/hoppr/hoppr-cyclonedx-models
 Description-Content-Type: text/markdown
 

{hoppr_cyclonedx_models-0.5.5 → hoppr_cyclonedx_models-0.6.2}/hoppr_cyclonedx_models/__init__.py

@@ -81,4 +81,4 @@ class Sbom(Sbom_1_5, Sbom_1_4, Sbom_1_3):  # pylint: disable=too-few-public-meth
         return Sbom_1_5(**sbom).dict(exclude_none=True, exclude_unset=True)
 
 
-__version__ = "0.5.5"
+__version__ = "0.6.2"

{hoppr_cyclonedx_models-0.5.5 → hoppr_cyclonedx_models-0.6.2}/hoppr_cyclonedx_models/cyclonedx_1_3.py

@@ -1,6 +1,6 @@
 """
 --------------------------------------------------------------------------------
-SPDX-FileCopyrightText: Copyright © 2023 Lockheed Martin <open.source@lmco.com>
+SPDX-FileCopyrightText: Copyright © 2024 Lockheed Martin <open.source@lmco.com>
 SPDX-FileName: hoppr_cyclonedx_models/cyclonedx_1_3.py
 SPDX-FileType: SOURCE
 SPDX-License-Identifier: MIT
@@ -25,7 +25,7 @@ THE SOFTWARE.
 --------------------------------------------------------------------------------
 This file was generated by datamodel-codegen:
   filename:  bom-1.3.schema.json
-  timestamp: 2023-09-12T17:26:28+00:00
+  timestamp: 2024-07-15T17:53:40+00:00
   version:   0.21.5
 """
 

{hoppr_cyclonedx_models-0.5.5 → hoppr_cyclonedx_models-0.6.2}/hoppr_cyclonedx_models/cyclonedx_1_4.py

@@ -1,6 +1,6 @@
 """
 --------------------------------------------------------------------------------
-SPDX-FileCopyrightText: Copyright © 2023 Lockheed Martin <open.source@lmco.com>
+SPDX-FileCopyrightText: Copyright © 2024 Lockheed Martin <open.source@lmco.com>
 SPDX-FileName: hoppr_cyclonedx_models/cyclonedx_1_4.py
 SPDX-FileType: SOURCE
 SPDX-License-Identifier: MIT
@@ -25,7 +25,7 @@ THE SOFTWARE.
 --------------------------------------------------------------------------------
 This file was generated by datamodel-codegen:
   filename:  bom-1.4.schema.json
-  timestamp: 2023-09-12T17:26:28+00:00
+  timestamp: 2024-07-15T17:53:40+00:00
   version:   0.21.5
 """
 

{hoppr_cyclonedx_models-0.5.5 → hoppr_cyclonedx_models-0.6.2}/hoppr_cyclonedx_models/cyclonedx_1_5.py

@@ -1,6 +1,6 @@
 """
 --------------------------------------------------------------------------------
-SPDX-FileCopyrightText: Copyright © 2023 Lockheed Martin <open.source@lmco.com>
+SPDX-FileCopyrightText: Copyright © 2024 Lockheed Martin <open.source@lmco.com>
 SPDX-FileName: hoppr_cyclonedx_models/cyclonedx_1_5.py
 SPDX-FileType: SOURCE
 SPDX-License-Identifier: MIT
@@ -25,7 +25,7 @@ THE SOFTWARE.
 --------------------------------------------------------------------------------
 This file was generated by datamodel-codegen:
   filename:  bom-1.5.schema.json
-  timestamp: 2023-09-12T17:26:28+00:00
+  timestamp: 2024-07-15T17:53:40+00:00
   version:   0.21.5
 """
 
@@ -33,7 +33,7 @@ from __future__ import annotations
 
 from datetime import datetime
 from enum import Enum
-from typing import List, Optional, Union
+from typing import Any, List, Optional, Union
 
 from pydantic import AnyUrl, EmailStr, Extra, Field
 from typing_extensions import Annotated, Literal
@@ -386,6 +386,17 @@ class Licensing(CycloneDXBaseModel):
     ] = None
 
 
+LicenseChoice2 = Annotated[
+    List[Any],
+    Field(
+        description="A tuple of exactly one SPDX License Expression.",
+        max_items=1,
+        min_items=1,
+        title="SPDX License Expression",
+    ),
+]
+
+
 class Type1(Enum):
     """
     Specifies the purpose for the patch including the resolution of defects, security issues, or new behavior or functionality.
@@ -821,39 +832,6 @@ class Callstack(CycloneDXBaseModel):
     frames: Annotated[Optional[List[Frame]], Field(title="Methods")] = None
 
 
-class ComponentEvidence(CycloneDXBaseModel):
-    """
-    Provides the ability to document evidence collected through various forms of extraction or analysis.
-    """
-
-    class Config:
-        extra = Extra.forbid
-
-    identity: Annotated[
-        Optional[Identity], Field(description="Evidence that substantiates the identity of a component.")
-    ] = None
-    occurrences: Annotated[
-        Optional[List[Occurrence]],
-        Field(
-            description="Evidence of individual instances of a component spread across multiple locations.",
-            title="Occurrences",
-        ),
-    ] = None
-    callstack: Annotated[
-        Optional[Callstack], Field(description="Evidence of the components use through the callstack.")
-    ] = None
-    licenses: Annotated[
-        Optional[List],
-        Field(
-            description=(
-                "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)"
-            ),
-            title="Component License(s)",
-        ),
-    ] = None
-    copyright: Annotated[Optional[List[Copyright]], Field(title="Copyright")] = None
-
-
 class AggregateType(Enum):
     COMPLETE = complete = "complete"
     INCOMPLETE = incomplete = "incomplete"
@@ -1876,6 +1854,13 @@ class License(CycloneDXBaseModel):
     ] = None
 
 
+class LicenseChoice1(CycloneDXBaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    license: License
+
+
 class Commit(CycloneDXBaseModel):
     """
     Specifies an individual commit
@@ -2050,6 +2035,39 @@ class ExternalReference(CycloneDXBaseModel):
     ] = None
 
 
+class ComponentEvidence(CycloneDXBaseModel):
+    """
+    Provides the ability to document evidence collected through various forms of extraction or analysis.
+    """
+
+    class Config:
+        extra = Extra.forbid
+
+    identity: Annotated[
+        Optional[Identity], Field(description="Evidence that substantiates the identity of a component.")
+    ] = None
+    occurrences: Annotated[
+        Optional[List[Occurrence]],
+        Field(
+            description="Evidence of individual instances of a component spread across multiple locations.",
+            title="Occurrences",
+        ),
+    ] = None
+    callstack: Annotated[
+        Optional[Callstack], Field(description="Evidence of the components use through the callstack.")
+    ] = None
+    licenses: Annotated[
+        Optional[Union[List[LicenseChoice1], LicenseChoice2]],
+        Field(
+            description=(
+                "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)"
+            ),
+            title="Component License(s)",
+        ),
+    ] = None
+    copyright: Annotated[Optional[List[Copyright]], Field(title="Copyright")] = None
+
+
 class Rating(CycloneDXBaseModel):
     """
     Defines the severity or risk ratings of a vulnerability.
@@ -2848,7 +2866,7 @@ class Service(CycloneDXBaseModel):
         ),
     ] = None
     licenses: Annotated[
-        Optional[List],
+        Optional[Union[List[LicenseChoice1], LicenseChoice2]],
         Field(
             description=(
                 "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)"
@@ -3572,7 +3590,7 @@ class Metadata(CycloneDXBaseModel):
         ),
     ] = None
     licenses: Annotated[
-        Optional[List],
+        Optional[Union[List[LicenseChoice1], LicenseChoice2]],
         Field(
             description=(
                 "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)"
@@ -3816,7 +3834,7 @@ class Component(CycloneDXBaseModel):
     ] = Scope.required
     hashes: Annotated[Optional[List[Hash]], Field(title="Component Hashes")] = None
     licenses: Annotated[
-        Optional[List],
+        Optional[Union[List[LicenseChoice1], LicenseChoice2]],
         Field(
             description=(
                 "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)"