[issue-426] update model: primaryPurpose

to ab0391a52864ce3fc568df3938f542058556731c

Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>

Author: armintaenzertng

README.md

@@ -50,7 +50,7 @@ additional installation of optional dependencies
 * Serialize to JSON-LD
 
 See [Quickstart to SPDX 3.0](#quickstart-to-spdx-30) below.  
-The implementation is based on the descriptive markdown files in the repository https://github.com/spdx/spdx-3-model (latest commit: a5e7cebcd2c7094f89fb7416be16803d67716402).
+The implementation is based on the descriptive markdown files in the repository https://github.com/spdx/spdx-3-model (latest commit: ab0391a52864ce3fc568df3938f542058556731c).
 
 
 # Installation

src/spdx_tools/spdx3/bump_from_spdx2/package.py

@@ -93,9 +93,7 @@ def bump_package(
         elif isinstance(id_or_ref, ExternalIdentifier):
             external_identifiers.append(id_or_ref)
 
-    package_purpose = (
-        [SoftwarePurpose[spdx2_package.primary_package_purpose.name]] if spdx2_package.primary_package_purpose else []
-    )
+    package_purpose = SoftwarePurpose[spdx2_package.primary_package_purpose.name]
 
     payload.add_element(
         Package(
@@ -113,7 +111,7 @@ def bump_package(
             built_time=spdx2_package.built_date,
             release_time=spdx2_package.release_date,
             valid_until_time=spdx2_package.valid_until_date,
-            purpose=package_purpose,
+            primary_purpose=package_purpose,
             package_version=spdx2_package.version,
             download_location=download_location,
             package_url=package_url,

src/spdx_tools/spdx3/model/ai/ai_package.py

@@ -46,7 +46,7 @@ def __init__(
         supplied_by: List[str],
         download_location: str,
         package_version: str,
-        purpose: List[SoftwarePurpose],
+        primary_purpose: SoftwarePurpose,
         release_time: datetime,
         creation_info: Optional[CreationInfo] = None,
         summary: Optional[str] = None,
@@ -61,6 +61,7 @@ def __init__(
         valid_until_time: Optional[datetime] = None,
         standard: List[str] = None,
         content_identifier: Optional[str] = None,
+        additional_purpose: List[SoftwarePurpose] = None,
         concluded_license: Optional[LicenseField] = None,
         declared_license: Optional[LicenseField] = None,
         copyright_text: Optional[str] = None,
@@ -88,6 +89,7 @@ def __init__(
         external_references = [] if external_references is None else external_references
         external_identifier = [] if external_identifier is None else external_identifier
         originated_by = [] if originated_by is None else originated_by
+        additional_purpose = [] if additional_purpose is None else additional_purpose
         standard = [] if standard is None else standard
         standard_compliance = [] if standard_compliance is None else standard_compliance
         type_of_model = [] if type_of_model is None else type_of_model

src/spdx_tools/spdx3/model/dataset/dataset.py

@@ -51,7 +51,7 @@ def __init__(
         name: str,
         originated_by: List[str],
         download_location: str,
-        purpose: List[SoftwarePurpose],
+        primary_purpose: SoftwarePurpose,
         built_time: datetime,
         release_time: datetime,
         dataset_type: str,
@@ -67,6 +67,7 @@ def __init__(
         valid_until_time: Optional[datetime] = None,
         standard: List[str] = None,
         content_identifier: Optional[str] = None,
+        additional_purpose: List[SoftwarePurpose] = None,
         concluded_license: Optional[LicenseField] = None,
         declared_license: Optional[LicenseField] = None,
         copyright_text: Optional[str] = None,
@@ -92,6 +93,7 @@ def __init__(
         external_references = [] if external_references is None else external_references
         external_identifier = [] if external_identifier is None else external_identifier
         originated_by = [] if originated_by is None else originated_by
+        additional_purpose = [] if additional_purpose is None else additional_purpose
         supplied_by = [] if supplied_by is None else supplied_by
         standard = [] if standard is None else standard
         data_preprocessing = [] if data_preprocessing is None else data_preprocessing

src/spdx_tools/spdx3/model/namespace_map.py

@@ -1,8 +1,6 @@
 # SPDX-FileCopyrightText: 2023 spdx contributors
 #
 # SPDX-License-Identifier: Apache-2.0
-from beartype.typing import Optional
-
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
 

src/spdx_tools/spdx3/model/software/file.py

@@ -36,7 +36,8 @@ def __init__(
         valid_until_time: Optional[datetime] = None,
         standard: List[str] = None,
         content_identifier: Optional[str] = None,
-        purpose: List[SoftwarePurpose] = None,
+        primary_purpose: Optional[SoftwarePurpose] = None,
+        additional_purpose: List[SoftwarePurpose] = None,
         concluded_license: Optional[LicenseField] = None,
         declared_license: Optional[LicenseField] = None,
         copyright_text: Optional[str] = None,
@@ -49,5 +50,5 @@ def __init__(
         originated_by = [] if originated_by is None else originated_by
         supplied_by = [] if supplied_by is None else supplied_by
         standard = [] if standard is None else standard
-        purpose = [] if purpose is None else purpose
+        additional_purpose = [] if additional_purpose is None else additional_purpose
         check_types_and_set_values(self, locals())

src/spdx_tools/spdx3/model/software/package.py

@@ -40,7 +40,8 @@ def __init__(
         valid_until_time: Optional[datetime] = None,
         standard: List[str] = None,
         content_identifier: Optional[str] = None,
-        purpose: List[SoftwarePurpose] = None,
+        primary_purpose: Optional[SoftwarePurpose] = None,
+        additional_purpose: List[SoftwarePurpose] = None,
         concluded_license: Optional[LicenseField] = None,
         declared_license: Optional[LicenseField] = None,
         copyright_text: Optional[str] = None,
@@ -57,5 +58,5 @@ def __init__(
         originated_by = [] if originated_by is None else originated_by
         supplied_by = [] if supplied_by is None else supplied_by
         standard = [] if standard is None else standard
-        purpose = [] if purpose is None else purpose
+        additional_purpose = [] if additional_purpose is None else additional_purpose
         check_types_and_set_values(self, locals())

src/spdx_tools/spdx3/model/software/snippet.py

@@ -38,7 +38,8 @@ def __init__(
         valid_until_time: Optional[datetime] = None,
         standard: List[str] = None,
         content_identifier: Optional[str] = None,
-        purpose: List[SoftwarePurpose] = None,
+        primary_purpose: Optional[SoftwarePurpose] = None,
+        additional_purpose: List[SoftwarePurpose] = None,
         concluded_license: Optional[LicenseField] = None,
         declared_license: Optional[LicenseField] = None,
         copyright_text: Optional[str] = None,
@@ -52,5 +53,5 @@ def __init__(
         originated_by = [] if originated_by is None else originated_by
         supplied_by = [] if supplied_by is None else supplied_by
         standard = [] if standard is None else standard
-        purpose = [] if purpose is None else purpose
+        additional_purpose = [] if additional_purpose is None else additional_purpose
         check_types_and_set_values(self, locals())

src/spdx_tools/spdx3/model/software/software_artifact.py

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 from abc import abstractmethod
+from dataclasses import field
 
 from beartype.typing import List, Optional
 
@@ -14,7 +15,8 @@
 @dataclass_with_properties
 class SoftwareArtifact(Artifact):
     content_identifier: Optional[str] = None
-    purpose: List[SoftwarePurpose] = None
+    primary_purpose: Optional[SoftwarePurpose] = None
+    additional_purpose: List[SoftwarePurpose] = field(default_factory=list)
     concluded_license: Optional[LicenseField] = None
     declared_license: Optional[LicenseField] = None
     copyright_text: Optional[str] = None

tests/spdx3/fixtures.py

@@ -380,7 +380,8 @@ def listed_license_fixture(
 
 SOFTWARE_ARTIFACT_DICT = {
     "content_identifier": "https://spdx.test/tools-python/contentIdentifier",
-    "purpose": [SoftwarePurpose.OTHER],
+    "primary_purpose": SoftwarePurpose.SOURCE,
+    "additional_purpose": [SoftwarePurpose.OTHER],
     "concluded_license": listed_license_fixture(),
     "declared_license": listed_license_fixture(),
     "copyright_text": "copyrightText",