diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/actor.py b/src/spdx_tools/spdx3/bump_from_spdx2/actor.py index 99212a54a..3c9e0a430 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/actor.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/actor.py @@ -3,11 +3,14 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx_tools.spdx3.model.organization import Organization -from spdx_tools.spdx3.model.person import Person -from spdx_tools.spdx3.model.tool import Tool +from spdx_tools.spdx3.model import ( + CreationInformation, + ExternalIdentifier, + ExternalIdentifierType, + Organization, + Person, + Tool, +) from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.actor import Actor as Spdx2_Actor from spdx_tools.spdx.model.actor import ActorType diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/annotation.py b/src/spdx_tools/spdx3/bump_from_spdx2/annotation.py index e14340aa9..d7cd383dc 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/annotation.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/annotation.py @@ -4,8 +4,7 @@ from copy import deepcopy from spdx_tools.spdx3.bump_from_spdx2.actor import bump_actor -from spdx_tools.spdx3.model.annotation import Annotation, AnnotationType -from spdx_tools.spdx3.model.creation_information import CreationInformation +from spdx_tools.spdx3.model import Annotation, AnnotationType, CreationInformation from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.actor import ActorType from spdx_tools.spdx.model.annotation import Annotation as Spdx2_Annotation diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/checksum.py b/src/spdx_tools/spdx3/bump_from_spdx2/checksum.py index b52b5472b..ae056081f 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/checksum.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/checksum.py @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2023 spdx contributors # # SPDX-License-Identifier: Apache-2.0 -from spdx_tools.spdx3.model.hash import Hash, HashAlgorithm +from spdx_tools.spdx3.model import Hash, HashAlgorithm from spdx_tools.spdx.model.checksum import Checksum as Spdx2_Checksum from spdx_tools.spdx.model.checksum import ChecksumAlgorithm diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/creation_information.py b/src/spdx_tools/spdx3/bump_from_spdx2/creation_information.py index 68e4f1484..ac365cac3 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/creation_information.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/creation_information.py @@ -9,8 +9,7 @@ from spdx_tools.spdx3.bump_from_spdx2.actor import bump_actor from spdx_tools.spdx3.bump_from_spdx2.external_document_ref import bump_external_document_ref from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.spdx_document import SpdxDocument +from spdx_tools.spdx3.model import CreationInformation, SpdxDocument from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.actor import ActorType from spdx_tools.spdx.model.document import CreationInfo as Spdx2_CreationInfo diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/external_document_ref.py b/src/spdx_tools/spdx3/bump_from_spdx2/external_document_ref.py index b17b41f34..bdbb0a9f7 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/external_document_ref.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/external_document_ref.py @@ -4,8 +4,7 @@ from typing import List from spdx_tools.spdx3.bump_from_spdx2.checksum import bump_checksum -from spdx_tools.spdx3.model.external_map import ExternalMap -from spdx_tools.spdx3.model.hash import Hash +from spdx_tools.spdx3.model import ExternalMap, Hash from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/file.py b/src/spdx_tools/spdx3/bump_from_spdx2/file.py index 55ed3438a..3e8cba161 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/file.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/file.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from spdx_tools.spdx3.bump_from_spdx2.checksum import bump_checksum from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.software.file import File +from spdx_tools.spdx3.model import CreationInformation +from spdx_tools.spdx3.model.software import File from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.file import File as Spdx2_File diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/package.py b/src/spdx_tools/spdx3/bump_from_spdx2/package.py index 2b3736481..0ef6692c3 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/package.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/package.py @@ -7,11 +7,14 @@ from spdx_tools.spdx3.bump_from_spdx2.bump_utils import handle_no_assertion_or_none from spdx_tools.spdx3.bump_from_spdx2.checksum import bump_checksum from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx_tools.spdx3.model.external_reference import ExternalReference, ExternalReferenceType -from spdx_tools.spdx3.model.software.package import Package -from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model import ( + CreationInformation, + ExternalIdentifier, + ExternalIdentifierType, + ExternalReference, + ExternalReferenceType, +) +from spdx_tools.spdx3.model.software import Package, SoftwarePurpose from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.package import ExternalPackageRef from spdx_tools.spdx.model.package import Package as Spdx2_Package diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/relationship.py b/src/spdx_tools/spdx3/bump_from_spdx2/relationship.py index aa42c6a4b..3ec263736 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/relationship.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/relationship.py @@ -3,8 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import Optional, Tuple -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.relationship import Relationship, RelationshipCompleteness, RelationshipType +from spdx_tools.spdx3.model import CreationInformation, Relationship, RelationshipCompleteness, RelationshipType from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.relationship import Relationship as Spdx2_Relationship from spdx_tools.spdx.model.relationship import RelationshipType as Spdx2_RelationshipType diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/snippet.py b/src/spdx_tools/spdx3/bump_from_spdx2/snippet.py index 5f2ae554b..4bb012016 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/snippet.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/snippet.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: Apache-2.0 from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.software.snippet import Snippet +from spdx_tools.spdx3.model import CreationInformation +from spdx_tools.spdx3.model.software import Snippet from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.snippet import Snippet as Spdx2_Snippet diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py b/src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py index 5a3c0a3ea..b12204c5e 100644 --- a/src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py @@ -7,8 +7,7 @@ from spdx_tools.spdx3.bump_from_spdx2.package import bump_package from spdx_tools.spdx3.bump_from_spdx2.relationship import bump_relationship from spdx_tools.spdx3.bump_from_spdx2.snippet import bump_snippet -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.spdx_document import SpdxDocument +from spdx_tools.spdx3.model import CreationInformation, SpdxDocument from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.document import Document as Spdx2_Document diff --git a/src/spdx_tools/spdx3/model/__init__.py b/src/spdx_tools/spdx3/model/__init__.py index e69de29bb..64fd80e39 100644 --- a/src/spdx_tools/spdx3/model/__init__.py +++ b/src/spdx_tools/spdx3/model/__init__.py @@ -0,0 +1,21 @@ +from spdx_tools.spdx3.model.profile_identifier import ProfileIdentifier +from spdx_tools.spdx3.model.creation_information import CreationInformation +from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model.hash import Hash, HashAlgorithm +from spdx_tools.spdx3.model.external_reference import ExternalReference, ExternalReferenceType +from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType +from spdx_tools.spdx3.model.external_map import ExternalMap +from spdx_tools.spdx3.model.namespace_map import NamespaceMap +from spdx_tools.spdx3.model.element import Element +from spdx_tools.spdx3.model.agent import Agent +from spdx_tools.spdx3.model.person import Person +from spdx_tools.spdx3.model.organization import Organization +from spdx_tools.spdx3.model.software_agent import SoftwareAgent +from spdx_tools.spdx3.model.tool import Tool +from spdx_tools.spdx3.model.spdx_collection import SpdxCollection +from spdx_tools.spdx3.model.bundle import Bundle +from spdx_tools.spdx3.model.bom import Bom +from spdx_tools.spdx3.model.spdx_document import SpdxDocument +from spdx_tools.spdx3.model.annotation import Annotation, AnnotationType +from spdx_tools.spdx3.model.relationship import Relationship, RelationshipType, RelationshipCompleteness +from spdx_tools.spdx3.model.artifact import Artifact diff --git a/src/spdx_tools/spdx3/model/agent.py b/src/spdx_tools/spdx3/model/agent.py index 2aa29b783..827a94d58 100644 --- a/src/spdx_tools/spdx3/model/agent.py +++ b/src/spdx_tools/spdx3/model/agent.py @@ -5,11 +5,7 @@ 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 -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.element import Element -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import CreationInformation, Element, ExternalIdentifier, ExternalReference, IntegrityMethod @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/annotation.py b/src/spdx_tools/spdx3/model/annotation.py index 925233871..3a35374d0 100644 --- a/src/spdx_tools/spdx3/model/annotation.py +++ b/src/spdx_tools/spdx3/model/annotation.py @@ -6,11 +6,7 @@ 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 -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.element import Element -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import CreationInformation, Element, ExternalIdentifier, ExternalReference, IntegrityMethod class AnnotationType(Enum): diff --git a/src/spdx_tools/spdx3/model/artifact.py b/src/spdx_tools/spdx3/model/artifact.py index b3270dc1e..71758ef42 100644 --- a/src/spdx_tools/spdx3/model/artifact.py +++ b/src/spdx_tools/spdx3/model/artifact.py @@ -5,7 +5,7 @@ from typing import Optional from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties -from spdx_tools.spdx3.model.element import Element +from spdx_tools.spdx3.model import Element @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/bom.py b/src/spdx_tools/spdx3/model/bom.py index 1fc2d57d6..be28b5536 100644 --- a/src/spdx_tools/spdx3/model/bom.py +++ b/src/spdx_tools/spdx3/model/bom.py @@ -5,13 +5,15 @@ 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 -from spdx_tools.spdx3.model.bundle import Bundle -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_map import ExternalMap -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod -from spdx_tools.spdx3.model.namespace_map import NamespaceMap +from spdx_tools.spdx3.model import ( + Bundle, + CreationInformation, + ExternalIdentifier, + ExternalMap, + ExternalReference, + IntegrityMethod, + NamespaceMap, +) @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/bundle.py b/src/spdx_tools/spdx3/model/bundle.py index 9b0aedf48..f23a86cdb 100644 --- a/src/spdx_tools/spdx3/model/bundle.py +++ b/src/spdx_tools/spdx3/model/bundle.py @@ -5,13 +5,15 @@ 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 -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_map import ExternalMap -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod -from spdx_tools.spdx3.model.namespace_map import NamespaceMap -from spdx_tools.spdx3.model.spdx_collection import SpdxCollection +from spdx_tools.spdx3.model import ( + CreationInformation, + ExternalIdentifier, + ExternalMap, + ExternalReference, + IntegrityMethod, + NamespaceMap, + SpdxCollection, +) @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/element.py b/src/spdx_tools/spdx3/model/element.py index 25ac72373..c5bcd0632 100644 --- a/src/spdx_tools/spdx3/model/element.py +++ b/src/spdx_tools/spdx3/model/element.py @@ -6,10 +6,7 @@ from typing import List, Optional from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import CreationInformation, ExternalIdentifier, ExternalReference, IntegrityMethod @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/external_map.py b/src/spdx_tools/spdx3/model/external_map.py index ec4d7d979..c26f96289 100644 --- a/src/spdx_tools/spdx3/model/external_map.py +++ b/src/spdx_tools/spdx3/model/external_map.py @@ -6,7 +6,7 @@ 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 -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import IntegrityMethod @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/hash.py b/src/spdx_tools/spdx3/model/hash.py index 5971bfb37..6e050845f 100644 --- a/src/spdx_tools/spdx3/model/hash.py +++ b/src/spdx_tools/spdx3/model/hash.py @@ -6,7 +6,7 @@ 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 -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import IntegrityMethod class HashAlgorithm(Enum): diff --git a/src/spdx_tools/spdx3/model/organization.py b/src/spdx_tools/spdx3/model/organization.py index 9a601c81a..0f204cb1f 100644 --- a/src/spdx_tools/spdx3/model/organization.py +++ b/src/spdx_tools/spdx3/model/organization.py @@ -5,11 +5,7 @@ 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 -from spdx_tools.spdx3.model.agent import Agent -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import Agent, CreationInformation, ExternalIdentifier, ExternalReference, IntegrityMethod @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/person.py b/src/spdx_tools/spdx3/model/person.py index d69cba3a5..fe9bf338e 100644 --- a/src/spdx_tools/spdx3/model/person.py +++ b/src/spdx_tools/spdx3/model/person.py @@ -5,11 +5,7 @@ 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 -from spdx_tools.spdx3.model.agent import Agent -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import Agent, CreationInformation, ExternalIdentifier, ExternalReference, IntegrityMethod @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/relationship.py b/src/spdx_tools/spdx3/model/relationship.py index 88284c8cc..beff233f9 100644 --- a/src/spdx_tools/spdx3/model/relationship.py +++ b/src/spdx_tools/spdx3/model/relationship.py @@ -6,11 +6,7 @@ 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 -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.element import Element -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import CreationInformation, Element, ExternalIdentifier, ExternalReference, IntegrityMethod class RelationshipType(Enum): diff --git a/src/spdx_tools/spdx3/model/software/__init__.py b/src/spdx_tools/spdx3/model/software/__init__.py index e69de29bb..61c798ade 100644 --- a/src/spdx_tools/spdx3/model/software/__init__.py +++ b/src/spdx_tools/spdx3/model/software/__init__.py @@ -0,0 +1,5 @@ +from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model.software.file import File +from spdx_tools.spdx3.model.software.package import Package +from spdx_tools.spdx3.model.software.snippet import Snippet +from spdx_tools.spdx3.model.software.sbom import Sbom diff --git a/src/spdx_tools/spdx3/model/software/file.py b/src/spdx_tools/spdx3/model/software/file.py index 1b8afbe96..3e80f841d 100644 --- a/src/spdx_tools/spdx3/model/software/file.py +++ b/src/spdx_tools/spdx3/model/software/file.py @@ -5,12 +5,14 @@ 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 -from spdx_tools.spdx3.model.artifact import Artifact -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod -from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model import ( + Artifact, + CreationInformation, + ExternalIdentifier, + ExternalReference, + IntegrityMethod, +) +from spdx_tools.spdx3.model.software import SoftwarePurpose @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/software/package.py b/src/spdx_tools/spdx3/model/software/package.py index c68df220e..bee1b227f 100644 --- a/src/spdx_tools/spdx3/model/software/package.py +++ b/src/spdx_tools/spdx3/model/software/package.py @@ -5,12 +5,14 @@ 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 -from spdx_tools.spdx3.model.artifact import Artifact -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod -from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model import ( + Artifact, + CreationInformation, + ExternalIdentifier, + ExternalReference, + IntegrityMethod, +) +from spdx_tools.spdx3.model.software import SoftwarePurpose @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/software/sbom.py b/src/spdx_tools/spdx3/model/software/sbom.py index 8cafed690..c3b568905 100644 --- a/src/spdx_tools/spdx3/model/software/sbom.py +++ b/src/spdx_tools/spdx3/model/software/sbom.py @@ -5,13 +5,15 @@ 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 -from spdx_tools.spdx3.model.bom import Bom -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_map import ExternalMap -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod -from spdx_tools.spdx3.model.namespace_map import NamespaceMap +from spdx_tools.spdx3.model import ( + Bom, + CreationInformation, + ExternalIdentifier, + ExternalMap, + ExternalReference, + IntegrityMethod, + NamespaceMap, +) @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/software/snippet.py b/src/spdx_tools/spdx3/model/software/snippet.py index 81b886873..5690ed24a 100644 --- a/src/spdx_tools/spdx3/model/software/snippet.py +++ b/src/spdx_tools/spdx3/model/software/snippet.py @@ -5,12 +5,14 @@ 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 -from spdx_tools.spdx3.model.artifact import Artifact -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod -from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model import ( + Artifact, + CreationInformation, + ExternalIdentifier, + ExternalReference, + IntegrityMethod, +) +from spdx_tools.spdx3.model.software import SoftwarePurpose @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/software_agent.py b/src/spdx_tools/spdx3/model/software_agent.py index d3a6c05f1..53f6cc934 100644 --- a/src/spdx_tools/spdx3/model/software_agent.py +++ b/src/spdx_tools/spdx3/model/software_agent.py @@ -5,11 +5,7 @@ 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 -from spdx_tools.spdx3.model.agent import Agent -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import Agent, CreationInformation, ExternalIdentifier, ExternalReference, IntegrityMethod @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/spdx_collection.py b/src/spdx_tools/spdx3/model/spdx_collection.py index d6a9bdcda..8e94e149e 100644 --- a/src/spdx_tools/spdx3/model/spdx_collection.py +++ b/src/spdx_tools/spdx3/model/spdx_collection.py @@ -6,9 +6,7 @@ from typing import List, Optional from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties -from spdx_tools.spdx3.model.element import Element -from spdx_tools.spdx3.model.external_map import ExternalMap -from spdx_tools.spdx3.model.namespace_map import NamespaceMap +from spdx_tools.spdx3.model import Element, ExternalMap, NamespaceMap @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/spdx_document.py b/src/spdx_tools/spdx3/model/spdx_document.py index 8c1a1bdf6..be0f26a4d 100644 --- a/src/spdx_tools/spdx3/model/spdx_document.py +++ b/src/spdx_tools/spdx3/model/spdx_document.py @@ -5,13 +5,15 @@ 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 -from spdx_tools.spdx3.model.bundle import Bundle -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_map import ExternalMap -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod -from spdx_tools.spdx3.model.namespace_map import NamespaceMap +from spdx_tools.spdx3.model import ( + Bundle, + CreationInformation, + ExternalIdentifier, + ExternalMap, + ExternalReference, + IntegrityMethod, + NamespaceMap, +) @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/model/tool.py b/src/spdx_tools/spdx3/model/tool.py index 8a10fbdd3..3ac27ada1 100644 --- a/src/spdx_tools/spdx3/model/tool.py +++ b/src/spdx_tools/spdx3/model/tool.py @@ -5,11 +5,7 @@ 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 -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.element import Element -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier -from spdx_tools.spdx3.model.external_reference import ExternalReference -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import CreationInformation, Element, ExternalIdentifier, ExternalReference, IntegrityMethod @dataclass_with_properties diff --git a/src/spdx_tools/spdx3/payload.py b/src/spdx_tools/spdx3/payload.py index b28e90a9e..911709a24 100644 --- a/src/spdx_tools/spdx3/payload.py +++ b/src/spdx_tools/spdx3/payload.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import Dict -from spdx_tools.spdx3.model.element import Element +from spdx_tools.spdx3.model import Element class Payload: diff --git a/src/spdx_tools/spdx3/writer/console/agent_writer.py b/src/spdx_tools/spdx3/writer/console/agent_writer.py index 58f36abfb..cd46ff703 100644 --- a/src/spdx_tools/spdx3/writer/console/agent_writer.py +++ b/src/spdx_tools/spdx3/writer/console/agent_writer.py @@ -3,10 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.agent import Agent -from spdx_tools.spdx3.model.organization import Organization -from spdx_tools.spdx3.model.person import Person -from spdx_tools.spdx3.model.software_agent import SoftwareAgent +from spdx_tools.spdx3.model import Agent, Organization, Person, SoftwareAgent from spdx_tools.spdx3.writer.console.element_writer import write_element_properties diff --git a/src/spdx_tools/spdx3/writer/console/annotation_writer.py b/src/spdx_tools/spdx3/writer/console/annotation_writer.py index 92d474a72..f5e4ac00b 100644 --- a/src/spdx_tools/spdx3/writer/console/annotation_writer.py +++ b/src/spdx_tools/spdx3/writer/console/annotation_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.annotation import Annotation +from spdx_tools.spdx3.model import Annotation from spdx_tools.spdx3.writer.console.console import write_value from spdx_tools.spdx3.writer.console.element_writer import write_element_properties diff --git a/src/spdx_tools/spdx3/writer/console/artifact_writer.py b/src/spdx_tools/spdx3/writer/console/artifact_writer.py index 5c1532dd6..474be979a 100644 --- a/src/spdx_tools/spdx3/writer/console/artifact_writer.py +++ b/src/spdx_tools/spdx3/writer/console/artifact_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.artifact import Artifact +from spdx_tools.spdx3.model import Artifact from spdx_tools.spdx3.writer.console.console import write_value from spdx_tools.spdx3.writer.console.element_writer import write_element_properties diff --git a/src/spdx_tools/spdx3/writer/console/bom_writer.py b/src/spdx_tools/spdx3/writer/console/bom_writer.py index 229e95005..c6e0f71ec 100644 --- a/src/spdx_tools/spdx3/writer/console/bom_writer.py +++ b/src/spdx_tools/spdx3/writer/console/bom_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.bom import Bom +from spdx_tools.spdx3.model import Bom from spdx_tools.spdx3.writer.console.bundle_writer import write_bundle diff --git a/src/spdx_tools/spdx3/writer/console/bundle_writer.py b/src/spdx_tools/spdx3/writer/console/bundle_writer.py index 8c0384383..2a7fc8d78 100644 --- a/src/spdx_tools/spdx3/writer/console/bundle_writer.py +++ b/src/spdx_tools/spdx3/writer/console/bundle_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.bundle import Bundle +from spdx_tools.spdx3.model import Bundle from spdx_tools.spdx3.writer.console.console import write_value from spdx_tools.spdx3.writer.console.spdx_collection_writer import write_collection diff --git a/src/spdx_tools/spdx3/writer/console/creation_information_writer.py b/src/spdx_tools/spdx3/writer/console/creation_information_writer.py index 3c1a2b076..25072ad3d 100644 --- a/src/spdx_tools/spdx3/writer/console/creation_information_writer.py +++ b/src/spdx_tools/spdx3/writer/console/creation_information_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.creation_information import CreationInformation +from spdx_tools.spdx3.model import CreationInformation from spdx_tools.spdx3.writer.console.console import write_value from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string diff --git a/src/spdx_tools/spdx3/writer/console/element_writer.py b/src/spdx_tools/spdx3/writer/console/element_writer.py index 14b814584..f3f14aa2c 100644 --- a/src/spdx_tools/spdx3/writer/console/element_writer.py +++ b/src/spdx_tools/spdx3/writer/console/element_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.element import Element +from spdx_tools.spdx3.model import Element from spdx_tools.spdx3.writer.console.console import write_value from spdx_tools.spdx3.writer.console.creation_information_writer import write_creation_info from spdx_tools.spdx3.writer.console.external_identifier_writer import write_external_identifier diff --git a/src/spdx_tools/spdx3/writer/console/external_identifier_writer.py b/src/spdx_tools/spdx3/writer/console/external_identifier_writer.py index f2d2db59e..e197581be 100644 --- a/src/spdx_tools/spdx3/writer/console/external_identifier_writer.py +++ b/src/spdx_tools/spdx3/writer/console/external_identifier_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier +from spdx_tools.spdx3.model import ExternalIdentifier from spdx_tools.spdx3.writer.console.console import write_value diff --git a/src/spdx_tools/spdx3/writer/console/external_map_writer.py b/src/spdx_tools/spdx3/writer/console/external_map_writer.py index 75ab4f4a6..1b53a1024 100644 --- a/src/spdx_tools/spdx3/writer/console/external_map_writer.py +++ b/src/spdx_tools/spdx3/writer/console/external_map_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.external_map import ExternalMap +from spdx_tools.spdx3.model import ExternalMap from spdx_tools.spdx3.writer.console.console import write_value from spdx_tools.spdx3.writer.console.hash_writer import write_hash from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_optional_heading diff --git a/src/spdx_tools/spdx3/writer/console/external_reference_writer.py b/src/spdx_tools/spdx3/writer/console/external_reference_writer.py index fd1e21293..64b8da2fd 100644 --- a/src/spdx_tools/spdx3/writer/console/external_reference_writer.py +++ b/src/spdx_tools/spdx3/writer/console/external_reference_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.external_reference import ExternalReference +from spdx_tools.spdx3.model import ExternalReference from spdx_tools.spdx3.writer.console.console import write_value diff --git a/src/spdx_tools/spdx3/writer/console/hash_writer.py b/src/spdx_tools/spdx3/writer/console/hash_writer.py index a1e56b71a..cbc0a99ed 100644 --- a/src/spdx_tools/spdx3/writer/console/hash_writer.py +++ b/src/spdx_tools/spdx3/writer/console/hash_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.hash import Hash +from spdx_tools.spdx3.model import Hash from spdx_tools.spdx3.writer.console.console import write_value from spdx_tools.spdx3.writer.console.integrity_method_writer import write_integrity_method diff --git a/src/spdx_tools/spdx3/writer/console/integrity_method_writer.py b/src/spdx_tools/spdx3/writer/console/integrity_method_writer.py index 14b61b497..2e3d4dfe5 100644 --- a/src/spdx_tools/spdx3/writer/console/integrity_method_writer.py +++ b/src/spdx_tools/spdx3/writer/console/integrity_method_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.model import IntegrityMethod from spdx_tools.spdx3.writer.console.console import write_value diff --git a/src/spdx_tools/spdx3/writer/console/namespace_map_writer.py b/src/spdx_tools/spdx3/writer/console/namespace_map_writer.py index 4fbada5b3..d4adf12b5 100644 --- a/src/spdx_tools/spdx3/writer/console/namespace_map_writer.py +++ b/src/spdx_tools/spdx3/writer/console/namespace_map_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.namespace_map import NamespaceMap +from spdx_tools.spdx3.model import NamespaceMap from spdx_tools.spdx3.writer.console.console import write_value diff --git a/src/spdx_tools/spdx3/writer/console/payload_writer.py b/src/spdx_tools/spdx3/writer/console/payload_writer.py index 59ce9b01e..2a91a4d90 100644 --- a/src/spdx_tools/spdx3/writer/console/payload_writer.py +++ b/src/spdx_tools/spdx3/writer/console/payload_writer.py @@ -3,19 +3,18 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.annotation import Annotation -from spdx_tools.spdx3.model.bom import Bom -from spdx_tools.spdx3.model.bundle import Bundle -from spdx_tools.spdx3.model.organization import Organization -from spdx_tools.spdx3.model.person import Person -from spdx_tools.spdx3.model.relationship import Relationship -from spdx_tools.spdx3.model.software.file import File -from spdx_tools.spdx3.model.software.package import Package -from spdx_tools.spdx3.model.software.sbom import Sbom -from spdx_tools.spdx3.model.software.snippet import Snippet -from spdx_tools.spdx3.model.software_agent import SoftwareAgent -from spdx_tools.spdx3.model.spdx_document import SpdxDocument -from spdx_tools.spdx3.model.tool import Tool +from spdx_tools.spdx3.model import ( + Annotation, + Bom, + Bundle, + Organization, + Person, + Relationship, + SoftwareAgent, + SpdxDocument, + Tool, +) +from spdx_tools.spdx3.model.software import File, Package, Sbom, Snippet from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx3.writer.console.agent_writer import write_agent from spdx_tools.spdx3.writer.console.annotation_writer import write_annotation diff --git a/src/spdx_tools/spdx3/writer/console/relationship_writer.py b/src/spdx_tools/spdx3/writer/console/relationship_writer.py index 7944e2090..738f45c4e 100644 --- a/src/spdx_tools/spdx3/writer/console/relationship_writer.py +++ b/src/spdx_tools/spdx3/writer/console/relationship_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.relationship import Relationship +from spdx_tools.spdx3.model import Relationship from spdx_tools.spdx3.writer.console.console import write_value from spdx_tools.spdx3.writer.console.element_writer import write_element_properties diff --git a/src/spdx_tools/spdx3/writer/console/software/file_writer.py b/src/spdx_tools/spdx3/writer/console/software/file_writer.py index 9257a0612..bd0bdfa54 100644 --- a/src/spdx_tools/spdx3/writer/console/software/file_writer.py +++ b/src/spdx_tools/spdx3/writer/console/software/file_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.software.file import File +from spdx_tools.spdx3.model.software import File from spdx_tools.spdx3.writer.console.artifact_writer import write_artifact_properties from spdx_tools.spdx3.writer.console.console import write_value diff --git a/src/spdx_tools/spdx3/writer/console/software/package_writer.py b/src/spdx_tools/spdx3/writer/console/software/package_writer.py index 4af2f5b4c..2e7535c2a 100644 --- a/src/spdx_tools/spdx3/writer/console/software/package_writer.py +++ b/src/spdx_tools/spdx3/writer/console/software/package_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.software.package import Package +from spdx_tools.spdx3.model.software import Package from spdx_tools.spdx3.writer.console.artifact_writer import write_artifact_properties from spdx_tools.spdx3.writer.console.console import write_value diff --git a/src/spdx_tools/spdx3/writer/console/software/sbom_writer.py b/src/spdx_tools/spdx3/writer/console/software/sbom_writer.py index 83a5b7956..039d55cc2 100644 --- a/src/spdx_tools/spdx3/writer/console/software/sbom_writer.py +++ b/src/spdx_tools/spdx3/writer/console/software/sbom_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.software.sbom import Sbom +from spdx_tools.spdx3.model.software import Sbom from spdx_tools.spdx3.writer.console.bom_writer import write_bom diff --git a/src/spdx_tools/spdx3/writer/console/software/snippet_writer.py b/src/spdx_tools/spdx3/writer/console/software/snippet_writer.py index 22415ee53..0378b3aa0 100644 --- a/src/spdx_tools/spdx3/writer/console/software/snippet_writer.py +++ b/src/spdx_tools/spdx3/writer/console/software/snippet_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.software.snippet import Snippet +from spdx_tools.spdx3.model.software import Snippet from spdx_tools.spdx3.writer.console.artifact_writer import write_artifact_properties from spdx_tools.spdx3.writer.console.console import write_value from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_range diff --git a/src/spdx_tools/spdx3/writer/console/spdx_collection_writer.py b/src/spdx_tools/spdx3/writer/console/spdx_collection_writer.py index 96461c09c..c34dcdb5e 100644 --- a/src/spdx_tools/spdx3/writer/console/spdx_collection_writer.py +++ b/src/spdx_tools/spdx3/writer/console/spdx_collection_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.spdx_collection import SpdxCollection +from spdx_tools.spdx3.model import SpdxCollection from spdx_tools.spdx3.writer.console.element_writer import write_element_properties from spdx_tools.spdx3.writer.console.external_map_writer import write_external_map from spdx_tools.spdx3.writer.console.namespace_map_writer import write_namespace_map diff --git a/src/spdx_tools/spdx3/writer/console/spdx_document_writer.py b/src/spdx_tools/spdx3/writer/console/spdx_document_writer.py index 426421753..15f3e57f7 100644 --- a/src/spdx_tools/spdx3/writer/console/spdx_document_writer.py +++ b/src/spdx_tools/spdx3/writer/console/spdx_document_writer.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx_tools.spdx3.model.spdx_document import SpdxDocument +from spdx_tools.spdx3.model import SpdxDocument from spdx_tools.spdx3.writer.console.bundle_writer import write_bundle diff --git a/src/spdx_tools/spdx3/writer/console/tool_writer.py b/src/spdx_tools/spdx3/writer/console/tool_writer.py index 3b2ee1560..35824a778 100644 --- a/src/spdx_tools/spdx3/writer/console/tool_writer.py +++ b/src/spdx_tools/spdx3/writer/console/tool_writer.py @@ -10,7 +10,7 @@ # limitations under the License. from typing import TextIO -from spdx_tools.spdx3.model.tool import Tool +from spdx_tools.spdx3.model import Tool from spdx_tools.spdx3.writer.console.element_writer import write_element_properties diff --git a/tests/spdx3/bump/test_actor_bump.py b/tests/spdx3/bump/test_actor_bump.py index bc91d555b..af01149f7 100644 --- a/tests/spdx3/bump/test_actor_bump.py +++ b/tests/spdx3/bump/test_actor_bump.py @@ -7,11 +7,14 @@ from semantic_version import Version from spdx_tools.spdx3.bump_from_spdx2.actor import bump_actor -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx_tools.spdx3.model.organization import Organization -from spdx_tools.spdx3.model.person import Person -from spdx_tools.spdx3.model.tool import Tool +from spdx_tools.spdx3.model import ( + CreationInformation, + ExternalIdentifier, + ExternalIdentifierType, + Organization, + Person, + Tool, +) from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.actor import Actor, ActorType diff --git a/tests/spdx3/bump/test_checksum_bump.py b/tests/spdx3/bump/test_checksum_bump.py index d1c167783..671653535 100644 --- a/tests/spdx3/bump/test_checksum_bump.py +++ b/tests/spdx3/bump/test_checksum_bump.py @@ -4,7 +4,7 @@ import pytest from spdx_tools.spdx3.bump_from_spdx2.checksum import bump_checksum, convert_checksum_algorithm_to_hash_algorithm -from spdx_tools.spdx3.model.hash import HashAlgorithm +from spdx_tools.spdx3.model import HashAlgorithm from spdx_tools.spdx.model.checksum import ChecksumAlgorithm from tests.spdx.fixtures import checksum_fixture diff --git a/tests/spdx3/bump/test_file_bump.py b/tests/spdx3/bump/test_file_bump.py index 5ac6c7214..7e63e6dd3 100644 --- a/tests/spdx3/bump/test_file_bump.py +++ b/tests/spdx3/bump/test_file_bump.py @@ -4,14 +4,14 @@ from unittest import mock from spdx_tools.spdx3.bump_from_spdx2.file import bump_file -from spdx_tools.spdx3.model.hash import Hash, HashAlgorithm -from spdx_tools.spdx3.model.software.file import File +from spdx_tools.spdx3.model import Hash, HashAlgorithm +from spdx_tools.spdx3.model.software import File from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.file import File as Spdx2_File from tests.spdx.fixtures import file_fixture -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_bump_file(creation_information): payload = Payload() document_namespace = "https://doc.namespace" diff --git a/tests/spdx3/bump/test_package_bump.py b/tests/spdx3/bump/test_package_bump.py index 923fe6479..6abbc2c8a 100644 --- a/tests/spdx3/bump/test_package_bump.py +++ b/tests/spdx3/bump/test_package_bump.py @@ -4,16 +4,15 @@ from unittest import TestCase, mock from spdx_tools.spdx3.bump_from_spdx2.package import bump_package -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx_tools.spdx3.model.external_reference import ExternalReference, ExternalReferenceType -from spdx_tools.spdx3.model.software.package import Package +from spdx_tools.spdx3.model import ExternalIdentifier, ExternalIdentifierType, ExternalReference, ExternalReferenceType +from spdx_tools.spdx3.model.software import Package from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.package import ExternalPackageRef, ExternalPackageRefCategory from spdx_tools.spdx.model.package import Package as Spdx2_Package from tests.spdx.fixtures import package_fixture -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.CreationInformation") def test_bump_package(creation_information): payload = Payload() document_namespace = "https://doc.namespace" @@ -45,7 +44,7 @@ def test_bump_package(creation_information): assert package.source_info == spdx2_package.source_info -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.CreationInformation") def test_bump_of_single_purl_without_comment(creation_information): payload = Payload() document_namespace = "https://doc.namespace" @@ -64,7 +63,7 @@ def test_bump_of_single_purl_without_comment(creation_information): assert package.external_identifier == [] -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.CreationInformation") def test_bump_of_single_purl_with_comment(creation_information): payload = Payload() document_namespace = "https://doc.namespace" @@ -85,7 +84,7 @@ def test_bump_of_single_purl_with_comment(creation_information): ] -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.CreationInformation") def test_bump_of_multiple_purls(creation_information): payload = Payload() document_namespace = "https://doc.namespace" diff --git a/tests/spdx3/bump/test_snippet_bump.py b/tests/spdx3/bump/test_snippet_bump.py index fa2b88889..9c9ecb72e 100644 --- a/tests/spdx3/bump/test_snippet_bump.py +++ b/tests/spdx3/bump/test_snippet_bump.py @@ -4,13 +4,13 @@ from unittest import mock from spdx_tools.spdx3.bump_from_spdx2.snippet import bump_snippet -from spdx_tools.spdx3.model.software.snippet import Snippet +from spdx_tools.spdx3.model.software import Snippet from spdx_tools.spdx3.payload import Payload from spdx_tools.spdx.model.snippet import Snippet as Spdx2_Snippet from tests.spdx.fixtures import snippet_fixture -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_bump_snippet(creation_information): payload = Payload() document_namespace = "https://doc.namespace" diff --git a/tests/spdx3/model/software/test_file.py b/tests/spdx3/model/software/test_file.py index 57247909f..49ee3a72d 100644 --- a/tests/spdx3/model/software/test_file.py +++ b/tests/spdx3/model/software/test_file.py @@ -5,11 +5,10 @@ import pytest -from spdx_tools.spdx3.model.software.file import File -from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model.software import File, SoftwarePurpose -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_correct_initialization(creation_information): file = File( "SPDXRef-File", @@ -27,7 +26,7 @@ def test_correct_initialization(creation_information): assert file.content_type == "MediaType" -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_invalid_initialization(creation_information): with pytest.raises(TypeError) as err: File( diff --git a/tests/spdx3/model/software/test_package.py b/tests/spdx3/model/software/test_package.py index fc9d9d0e9..8bc4dfbc5 100644 --- a/tests/spdx3/model/software/test_package.py +++ b/tests/spdx3/model/software/test_package.py @@ -5,11 +5,10 @@ import pytest -from spdx_tools.spdx3.model.software.package import Package -from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model.software import Package, SoftwarePurpose -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_correct_initialization(creation_information): package = Package( "SPDXRef-Package", @@ -34,7 +33,7 @@ def test_correct_initialization(creation_information): assert package.source_info == "some info" -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_invalid_initialization(creation_information): with pytest.raises(TypeError) as err: Package( diff --git a/tests/spdx3/model/software/test_sbom.py b/tests/spdx3/model/software/test_sbom.py index d51ea3a8f..9e2c304ca 100644 --- a/tests/spdx3/model/software/test_sbom.py +++ b/tests/spdx3/model/software/test_sbom.py @@ -5,10 +5,10 @@ import pytest -from spdx_tools.spdx3.model.software.sbom import Sbom +from spdx_tools.spdx3.model.software import Sbom -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_correct_initialization(creation_information): sbom = Sbom("SPDXRef-Sbom", creation_information, elements=["spdx_id1", "spdx_id2"], root_elements=["spdx_id3"]) diff --git a/tests/spdx3/model/software/test_snippet.py b/tests/spdx3/model/software/test_snippet.py index f7ff9f2b9..4657cc635 100644 --- a/tests/spdx3/model/software/test_snippet.py +++ b/tests/spdx3/model/software/test_snippet.py @@ -5,11 +5,10 @@ import pytest -from spdx_tools.spdx3.model.software.snippet import Snippet -from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model.software import Snippet, SoftwarePurpose -@mock.patch("spdx_tools.spdx3.model.software.snippet.Snippet", autospec=True) +@mock.patch("spdx_tools.spdx3.model.software.Snippet", autospec=True) def test_correct_initialization(creation_information): snippet = Snippet( "SPDXRef-Snippet", @@ -28,7 +27,7 @@ def test_correct_initialization(creation_information): assert snippet.line_range == (346, 456) -@mock.patch("spdx_tools.spdx3.model.software.snippet.Snippet", autospec=True) +@mock.patch("spdx_tools.spdx3.model.software.Snippet", autospec=True) def test_invalid_initialization(creation_information): with pytest.raises(TypeError) as err: Snippet(2, creation_information, originated_by=34, byte_range="34:45") diff --git a/tests/spdx3/model/test_abstract_classes.py b/tests/spdx3/model/test_abstract_classes.py index 7eb583a28..39e45a46a 100644 --- a/tests/spdx3/model/test_abstract_classes.py +++ b/tests/spdx3/model/test_abstract_classes.py @@ -3,10 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 import pytest -from spdx_tools.spdx3.model.artifact import Artifact -from spdx_tools.spdx3.model.element import Element -from spdx_tools.spdx3.model.integrity_method import IntegrityMethod -from spdx_tools.spdx3.model.spdx_collection import SpdxCollection +from spdx_tools.spdx3.model import Artifact, Element, IntegrityMethod, SpdxCollection @pytest.mark.parametrize("abstract_class", [Element, Artifact, SpdxCollection, IntegrityMethod]) diff --git a/tests/spdx3/model/test_agent.py b/tests/spdx3/model/test_agent.py index ec4cf8f00..ed057c4da 100644 --- a/tests/spdx3/model/test_agent.py +++ b/tests/spdx3/model/test_agent.py @@ -6,12 +6,15 @@ import pytest from semantic_version import Version -from spdx_tools.spdx3.model.agent import Agent -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx_tools.spdx3.model.organization import Organization -from spdx_tools.spdx3.model.person import Person -from spdx_tools.spdx3.model.software_agent import SoftwareAgent +from spdx_tools.spdx3.model import ( + Agent, + CreationInformation, + ExternalIdentifier, + ExternalIdentifierType, + Organization, + Person, + SoftwareAgent, +) @pytest.mark.parametrize("agent_class", [Agent, Person, Organization, SoftwareAgent]) diff --git a/tests/spdx3/model/test_annotation.py b/tests/spdx3/model/test_annotation.py index bd8019153..f951fd671 100644 --- a/tests/spdx3/model/test_annotation.py +++ b/tests/spdx3/model/test_annotation.py @@ -5,10 +5,10 @@ import pytest -from spdx_tools.spdx3.model.annotation import Annotation, AnnotationType +from spdx_tools.spdx3.model import Annotation, AnnotationType -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_correct_initialization(creation_information): annotation = Annotation( "SPDXRef-Annotation", @@ -27,7 +27,7 @@ def test_correct_initialization(creation_information): assert annotation.statement == "This is a statement" -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.CreationInformation") def test_invalid_initialization(creation_information): with pytest.raises(TypeError) as err: Annotation( diff --git a/tests/spdx3/model/test_bom.py b/tests/spdx3/model/test_bom.py index 8e93afeae..0c897d841 100644 --- a/tests/spdx3/model/test_bom.py +++ b/tests/spdx3/model/test_bom.py @@ -6,10 +6,10 @@ import pytest -from spdx_tools.spdx3.model.bom import Bom +from spdx_tools.spdx3.model import Bom -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_correct_initialization(creation_information): bom = Bom("SPDXRef-Bom", creation_information, elements=["spdx_id1"], root_elements=["spdx_id2"]) diff --git a/tests/spdx3/model/test_bundle.py b/tests/spdx3/model/test_bundle.py index f5a4643c2..b3c58e77b 100644 --- a/tests/spdx3/model/test_bundle.py +++ b/tests/spdx3/model/test_bundle.py @@ -5,11 +5,11 @@ import pytest -from spdx_tools.spdx3.model.bundle import Bundle +from spdx_tools.spdx3.model import Bundle -@mock.patch("spdx_tools.spdx3.model.namespace_map.NamespaceMap", autospec=True) -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.NamespaceMap", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_correct_initialization(creation_information, namespace): bundle = Bundle( "SPDXRef-Bundle", @@ -28,7 +28,7 @@ def test_correct_initialization(creation_information, namespace): assert bundle.namespaces == [namespace] -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_invalid_initialization(creation_information): with pytest.raises(TypeError) as err: Bundle(4, creation_information, elements="spdx_id1", root_elements=[42], namespaces=True, context=["yes"]) diff --git a/tests/spdx3/model/test_creation_information.py b/tests/spdx3/model/test_creation_information.py index bccb9e0f9..1c6ed1cba 100644 --- a/tests/spdx3/model/test_creation_information.py +++ b/tests/spdx3/model/test_creation_information.py @@ -6,7 +6,7 @@ import pytest from semantic_version import Version -from spdx_tools.spdx3.model.creation_information import CreationInformation +from spdx_tools.spdx3.model import CreationInformation def test_correct_initialization(): diff --git a/tests/spdx3/model/test_external_identifier.py b/tests/spdx3/model/test_external_identifier.py index e6f4107c4..ab37631fe 100644 --- a/tests/spdx3/model/test_external_identifier.py +++ b/tests/spdx3/model/test_external_identifier.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 import pytest -from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType +from spdx_tools.spdx3.model import ExternalIdentifier, ExternalIdentifierType def test_correct_initialization(): diff --git a/tests/spdx3/model/test_external_map.py b/tests/spdx3/model/test_external_map.py index 9f46e83b0..c925dade2 100644 --- a/tests/spdx3/model/test_external_map.py +++ b/tests/spdx3/model/test_external_map.py @@ -5,10 +5,10 @@ import pytest -from spdx_tools.spdx3.model.external_map import ExternalMap +from spdx_tools.spdx3.model import ExternalMap -@mock.patch("spdx_tools.spdx3.model.integrity_method.IntegrityMethod", autospec=True) +@mock.patch("spdx_tools.spdx3.model.IntegrityMethod", autospec=True) def test_correct_initialization(integrity_method): external_map = ExternalMap("https://external.id", [integrity_method], "https://location.hint") diff --git a/tests/spdx3/model/test_external_reference.py b/tests/spdx3/model/test_external_reference.py index e087dac4e..ebee27713 100644 --- a/tests/spdx3/model/test_external_reference.py +++ b/tests/spdx3/model/test_external_reference.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 import pytest -from spdx_tools.spdx3.model.external_reference import ExternalReference, ExternalReferenceType +from spdx_tools.spdx3.model import ExternalReference, ExternalReferenceType def test_correct_initialization(): diff --git a/tests/spdx3/model/test_hash.py b/tests/spdx3/model/test_hash.py index 460a55747..1cfc4f117 100644 --- a/tests/spdx3/model/test_hash.py +++ b/tests/spdx3/model/test_hash.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 import pytest -from spdx_tools.spdx3.model.hash import Hash, HashAlgorithm +from spdx_tools.spdx3.model import Hash, HashAlgorithm def test_correct_initialization(): diff --git a/tests/spdx3/model/test_namespace_map.py b/tests/spdx3/model/test_namespace_map.py index a6b63ef64..0217bff18 100644 --- a/tests/spdx3/model/test_namespace_map.py +++ b/tests/spdx3/model/test_namespace_map.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 import pytest -from spdx_tools.spdx3.model.namespace_map import NamespaceMap +from spdx_tools.spdx3.model import NamespaceMap def test_correct_initialization(): diff --git a/tests/spdx3/model/test_relationship.py b/tests/spdx3/model/test_relationship.py index 4c7d60f8a..27c127543 100644 --- a/tests/spdx3/model/test_relationship.py +++ b/tests/spdx3/model/test_relationship.py @@ -5,10 +5,10 @@ import pytest -from spdx_tools.spdx3.model.relationship import Relationship, RelationshipCompleteness, RelationshipType +from spdx_tools.spdx3.model import Relationship, RelationshipCompleteness, RelationshipType -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_correct_initialization(creation_information): relationship = Relationship( "SPDXRef-Relationship", @@ -27,7 +27,7 @@ def test_correct_initialization(creation_information): assert relationship.completeness == RelationshipCompleteness.UNKNOWN -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_invalid_initialization(creation_information): with pytest.raises(TypeError) as err: Relationship("SPDXRef-Relationship", creation_information, 42, 5, "Relationshiptype", completeness=True) diff --git a/tests/spdx3/model/test_spdx_document.py b/tests/spdx3/model/test_spdx_document.py index 9e5480abc..d5a1f2cba 100644 --- a/tests/spdx3/model/test_spdx_document.py +++ b/tests/spdx3/model/test_spdx_document.py @@ -5,10 +5,10 @@ import pytest -from spdx_tools.spdx3.model.spdx_document import SpdxDocument +from spdx_tools.spdx3.model import SpdxDocument -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_correct_initialization(creation_information): spdx_document = SpdxDocument( "SPDXRef-DOCUMENT", creation_information, "Test document", elements=["spdx_id1"], root_elements=["spdx_id2"] @@ -34,7 +34,7 @@ def test_invalid_initialization(): ] -@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.CreationInformation", autospec=True) def test_incomplete_initialization(creation_information): with pytest.raises(TypeError) as err: SpdxDocument("SPDXRef-Document", creation_information) diff --git a/tests/spdx3/model/test_tool.py b/tests/spdx3/model/test_tool.py index dd54118f2..1820c7c6e 100644 --- a/tests/spdx3/model/test_tool.py +++ b/tests/spdx3/model/test_tool.py @@ -6,8 +6,7 @@ import pytest from semantic_version import Version -from spdx_tools.spdx3.model.creation_information import CreationInformation -from spdx_tools.spdx3.model.tool import Tool +from spdx_tools.spdx3.model import CreationInformation, Tool def test_correct_initialization():