[issue-426] change external_references to singular

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

Author: armintaenzertng

src/spdx_tools/spdx3/bump_from_spdx2/package.py

@@ -75,8 +75,8 @@ def bump_package(
         "and missing definition of license profile",
     )
 
-    external_references = []
-    external_identifiers = []
+    external_reference = []
+    external_identifier = []
     purl_refs = [
         external_ref for external_ref in spdx2_package.external_references if external_ref.reference_type == "purl"
     ]
@@ -89,9 +89,9 @@ def bump_package(
             continue
         id_or_ref = bump_external_package_ref(spdx2_external_ref)
         if isinstance(id_or_ref, ExternalReference):
-            external_references.append(id_or_ref)
+            external_reference.append(id_or_ref)
         elif isinstance(id_or_ref, ExternalIdentifier):
-            external_identifiers.append(id_or_ref)
+            external_identifier.append(id_or_ref)
 
     package_purpose = SoftwarePurpose[spdx2_package.primary_package_purpose.name]
 
@@ -104,8 +104,8 @@ def bump_package(
             description=spdx2_package.description,
             comment=spdx2_package.comment,
             verified_using=integrity_methods,
-            external_references=external_references,
-            external_identifier=external_identifiers,
+            external_reference=external_reference,
+            external_identifier=external_identifier,
             originated_by=originated_by_spdx_id,
             supplied_by=supplied_by_spdx_id,
             built_time=spdx2_package.built_date,

src/spdx_tools/spdx3/model/agent.py

@@ -19,11 +19,11 @@ def __init__(
         description: Optional[str] = None,
         comment: Optional[str] = None,
         verified_using: List[IntegrityMethod] = None,
-        external_references: List[ExternalReference] = None,
+        external_reference: List[ExternalReference] = None,
         external_identifier: List[ExternalIdentifier] = None,
         extension: Optional[str] = None,
     ):
         verified_using = [] if verified_using is None else verified_using
-        external_references = [] if external_references is None else external_references
+        external_reference = [] if external_reference is None else external_reference
         external_identifier = [] if external_identifier is None else external_identifier
         check_types_and_set_values(self, locals())

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

@@ -53,7 +53,7 @@ def __init__(
         description: Optional[str] = None,
         comment: Optional[str] = None,
         verified_using: List[IntegrityMethod] = None,
-        external_references: List[ExternalReference] = None,
+        external_reference: List[ExternalReference] = None,
         external_identifier: List[ExternalIdentifier] = None,
         extension: Optional[str] = None,
         originated_by: List[str] = None,
@@ -86,7 +86,7 @@ def __init__(
         safety_risk_assessment: Optional[SafetyRiskAssessmentType] = None,
     ):
         verified_using = [] if verified_using is None else verified_using
-        external_references = [] if external_references is None else external_references
+        external_reference = [] if external_reference is None else external_reference
         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

src/spdx_tools/spdx3/model/annotation.py

@@ -34,14 +34,14 @@ def __init__(
         description: Optional[str] = None,
         comment: Optional[str] = None,
         verified_using: List[IntegrityMethod] = None,
-        external_references: List[ExternalReference] = None,
+        external_reference: List[ExternalReference] = None,
         external_identifier: List[ExternalIdentifier] = None,
         extension: Optional[str] = None,
         content_type: List[str] = None,
         statement: Optional[str] = None,
     ):
         verified_using = [] if verified_using is None else verified_using
-        external_references = [] if external_references is None else external_references
+        external_reference = [] if external_reference is None else external_reference
         external_identifier = [] if external_identifier is None else external_identifier
         content_type = [] if content_type is None else content_type
         check_types_and_set_values(self, locals())

src/spdx_tools/spdx3/model/bom.py

@@ -32,15 +32,15 @@ def __init__(
         description: Optional[str] = None,
         comment: Optional[str] = None,
         verified_using: List[IntegrityMethod] = None,
-        external_references: List[ExternalReference] = None,
+        external_reference: List[ExternalReference] = None,
         external_identifier: List[ExternalIdentifier] = None,
         extension: Optional[str] = None,
         namespaces: List[NamespaceMap] = None,
         imports: List[ExternalMap] = None,
         context: Optional[str] = None,
     ):
         verified_using = [] if verified_using is None else verified_using
-        external_references = [] if external_references is None else external_references
+        external_reference = [] if external_reference is None else external_reference
         external_identifier = [] if external_identifier is None else external_identifier
         namespaces = [] if namespaces is None else namespaces
         imports = [] if imports is None else imports

src/spdx_tools/spdx3/model/build/build.py

@@ -33,7 +33,7 @@ def __init__(
         description: Optional[str] = None,
         comment: Optional[str] = None,
         verified_using: List[IntegrityMethod] = None,
-        external_references: List[ExternalReference] = None,
+        external_reference: List[ExternalReference] = None,
         external_identifier: List[ExternalIdentifier] = None,
         extension: Optional[str] = None,
         build_id: Optional[str] = None,
@@ -46,7 +46,7 @@ def __init__(
         environment: Dict[str, str] = None,
     ):
         verified_using = [] if verified_using is None else verified_using
-        external_references = [] if external_references is None else external_references
+        external_reference = [] if external_reference is None else external_reference
         external_identifier = [] if external_identifier is None else external_identifier
         config_source_entrypoint = [] if config_source_entrypoint is None else config_source_entrypoint
         config_source_uri = [] if config_source_uri is None else config_source_uri

src/spdx_tools/spdx3/model/bundle.py

@@ -31,15 +31,15 @@ def __init__(
         description: Optional[str] = None,
         comment: Optional[str] = None,
         verified_using: List[IntegrityMethod] = None,
-        external_references: List[ExternalReference] = None,
+        external_reference: List[ExternalReference] = None,
         external_identifier: List[ExternalIdentifier] = None,
         extension: Optional[str] = None,
         namespaces: List[NamespaceMap] = None,
         imports: List[ExternalMap] = None,
         context: Optional[str] = None,
     ):
         verified_using = [] if verified_using is None else verified_using
-        external_references = [] if external_references is None else external_references
+        external_reference = [] if external_reference is None else external_reference
         external_identifier = [] if external_identifier is None else external_identifier
         namespaces = [] if namespaces is None else namespaces
         imports = [] if imports is None else imports

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

@@ -77,7 +77,7 @@ def __init__(
         description: Optional[str] = None,
         comment: Optional[str] = None,
         verified_using: List[IntegrityMethod] = None,
-        external_references: List[ExternalReference] = None,
+        external_reference: List[ExternalReference] = None,
         external_identifier: List[ExternalIdentifier] = None,
         extension: Optional[str] = None,
         supplied_by: List[str] = None,
@@ -107,7 +107,7 @@ def __init__(
         dataset_availability: Optional[DatasetAvailabilityType] = None,
     ):
         verified_using = [] if verified_using is None else verified_using
-        external_references = [] if external_references is None else external_references
+        external_reference = [] if external_reference is None else external_reference
         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

src/spdx_tools/spdx3/model/element.py

@@ -19,7 +19,7 @@ class Element(ABC):
     description: Optional[str] = None
     comment: Optional[str] = None
     verified_using: List[IntegrityMethod] = field(default_factory=list)
-    external_references: List[ExternalReference] = field(default_factory=list)
+    external_reference: List[ExternalReference] = field(default_factory=list)
     external_identifier: List[ExternalIdentifier] = field(default_factory=list)
     extension: Optional[str] = None  # placeholder for extension
 

src/spdx_tools/spdx3/model/lifecycle_scoped_relationship.py

@@ -44,7 +44,7 @@ def __init__(
         description: Optional[str] = None,
         comment: Optional[str] = None,
         verified_using: List[IntegrityMethod] = None,
-        external_references: List[ExternalReference] = None,
+        external_reference: List[ExternalReference] = None,
         external_identifier: List[ExternalIdentifier] = None,
         extension: Optional[str] = None,
         completeness: Optional[RelationshipCompleteness] = None,
@@ -54,6 +54,6 @@ def __init__(
     ):
         to = [] if to is None else to
         verified_using = [] if verified_using is None else verified_using
-        external_references = [] if external_references is None else external_references
+        external_reference = [] if external_reference is None else external_reference
         external_identifier = [] if external_identifier is None else external_identifier
         check_types_and_set_values(self, locals())