diff --git a/pyproject.toml b/pyproject.toml index eefa72de3..dcdb6bdf2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ development = ["black", "flake8", "isort", "networkx", "pytest"] [project.scripts] pyspdxtools = "spdx_tools.spdx.clitools.pyspdxtools:main" -pyspdxtools3 = "spdx3.clitools.pyspdxtools3:main" +pyspdxtools3 = "spdx_tools.spdx3.clitools.pyspdxtools3:main" [tool.setuptools] zip-safe = false # because of the uses of __file__: https://github.com/spdx/tools-python/issues/257 diff --git a/src/spdx3/writer/console/__init__.py b/src/spdx3/writer/console/__init__.py deleted file mode 100644 index c2d090abc..000000000 --- a/src/spdx3/writer/console/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -""" This is a temporary package to write the implemented model of spdx3.0 to console. As soon as serialization formats - are properly defined this package can be deleted.""" diff --git a/src/spdx3/writer/console/payload_writer.py b/src/spdx3/writer/console/payload_writer.py deleted file mode 100644 index 5f18d7e88..000000000 --- a/src/spdx3/writer/console/payload_writer.py +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-FileCopyrightText: 2023 spdx contributors -# -# SPDX-License-Identifier: Apache-2.0 -from typing import TextIO - -from spdx3.model.annotation import Annotation -from spdx3.model.bom import Bom -from spdx3.model.bundle import Bundle -from spdx3.model.organization import Organization -from spdx3.model.person import Person -from spdx3.model.relationship import Relationship -from spdx3.model.software.file import File -from spdx3.model.software.package import Package -from spdx3.model.software.sbom import Sbom -from spdx3.model.software.snippet import Snippet -from spdx3.model.software_agent import SoftwareAgent -from spdx3.model.spdx_document import SpdxDocument -from spdx3.model.tool import Tool -from spdx3.payload import Payload -from spdx3.writer.console.agent_writer import write_agent -from spdx3.writer.console.annotation_writer import write_annotation -from spdx3.writer.console.bom_writer import write_bom -from spdx3.writer.console.bundle_writer import write_bundle -from spdx3.writer.console.relationship_writer import write_relationship -from spdx3.writer.console.software.file_writer import write_file -from spdx3.writer.console.software.package_writer import write_package -from spdx3.writer.console.software.sbom_writer import write_sbom -from spdx3.writer.console.software.snippet_writer import write_snippet -from spdx3.writer.console.spdx_document_writer import write_spdx_document -from spdx3.writer.console.tool_writer import write_tool - -MAP_CLASS_TO_WRITE_METHOD = { - Annotation: write_annotation, - Relationship: write_relationship, - Bundle: write_bundle, - SpdxDocument: write_spdx_document, - Bom: write_bom, - File: write_file, - Package: write_package, - Snippet: write_snippet, - Sbom: write_sbom, - Person: write_agent, - Organization: write_agent, - SoftwareAgent: write_agent, - Tool: write_tool, -} - - -def write_payload(payload: Payload, text_output: TextIO): - for element in payload.get_full_map().values(): - write_method = MAP_CLASS_TO_WRITE_METHOD[type(element)] - write_method(element, text_output) - text_output.write("\n") diff --git a/src/spdx3/README.md b/src/spdx_tools/spdx3/README.md similarity index 100% rename from src/spdx3/README.md rename to src/spdx_tools/spdx3/README.md diff --git a/src/spdx3/__init__.py b/src/spdx_tools/spdx3/__init__.py similarity index 100% rename from src/spdx3/__init__.py rename to src/spdx_tools/spdx3/__init__.py diff --git a/src/spdx3/bump_from_spdx2/__init__.py b/src/spdx_tools/spdx3/bump_from_spdx2/__init__.py similarity index 100% rename from src/spdx3/bump_from_spdx2/__init__.py rename to src/spdx_tools/spdx3/bump_from_spdx2/__init__.py diff --git a/src/spdx3/bump_from_spdx2/actor.py b/src/spdx_tools/spdx3/bump_from_spdx2/actor.py similarity index 77% rename from src/spdx3/bump_from_spdx2/actor.py rename to src/spdx_tools/spdx3/bump_from_spdx2/actor.py index d24bc2804..99212a54a 100644 --- a/src/spdx3/bump_from_spdx2/actor.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/actor.py @@ -3,14 +3,14 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx3.model.organization import Organization -from spdx3.model.person import Person -from spdx3.model.tool import Tool -from spdx3.payload import Payload -from spdx.model.actor import Actor as Spdx2_Actor -from spdx.model.actor import ActorType +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.payload import Payload +from spdx_tools.spdx.model.actor import Actor as Spdx2_Actor +from spdx_tools.spdx.model.actor import ActorType def bump_actor( diff --git a/src/spdx3/bump_from_spdx2/annotation.py b/src/spdx_tools/spdx3/bump_from_spdx2/annotation.py similarity index 78% rename from src/spdx3/bump_from_spdx2/annotation.py rename to src/spdx_tools/spdx3/bump_from_spdx2/annotation.py index a03bb619f..e14340aa9 100644 --- a/src/spdx3/bump_from_spdx2/annotation.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/annotation.py @@ -3,12 +3,12 @@ # SPDX-License-Identifier: Apache-2.0 from copy import deepcopy -from spdx3.bump_from_spdx2.actor import bump_actor -from spdx3.model.annotation import Annotation, AnnotationType -from spdx3.model.creation_information import CreationInformation -from spdx3.payload import Payload -from spdx.model.actor import ActorType -from spdx.model.annotation import Annotation as Spdx2_Annotation +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.payload import Payload +from spdx_tools.spdx.model.actor import ActorType +from spdx_tools.spdx.model.annotation import Annotation as Spdx2_Annotation def bump_annotation( diff --git a/src/spdx3/bump_from_spdx2/bump_utils.py b/src/spdx_tools/spdx3/bump_from_spdx2/bump_utils.py similarity index 79% rename from src/spdx3/bump_from_spdx2/bump_utils.py rename to src/spdx_tools/spdx3/bump_from_spdx2/bump_utils.py index 801ccc27e..e45b05909 100644 --- a/src/spdx3/bump_from_spdx2/bump_utils.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/bump_utils.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from typing import Optional, Union -from spdx.model.spdx_no_assertion import SpdxNoAssertion -from spdx.model.spdx_none import SpdxNone +from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion +from spdx_tools.spdx.model.spdx_none import SpdxNone def handle_no_assertion_or_none(field: Union[SpdxNone, SpdxNoAssertion, str], field_name: str) -> Optional[str]: diff --git a/src/spdx3/bump_from_spdx2/checksum.py b/src/spdx_tools/spdx3/bump_from_spdx2/checksum.py similarity index 78% rename from src/spdx3/bump_from_spdx2/checksum.py rename to src/spdx_tools/spdx3/bump_from_spdx2/checksum.py index 0f66b5221..b52b5472b 100644 --- a/src/spdx3/bump_from_spdx2/checksum.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/checksum.py @@ -1,9 +1,9 @@ # SPDX-FileCopyrightText: 2023 spdx contributors # # SPDX-License-Identifier: Apache-2.0 -from spdx3.model.hash import Hash, HashAlgorithm -from spdx.model.checksum import Checksum as Spdx2_Checksum -from spdx.model.checksum import ChecksumAlgorithm +from spdx_tools.spdx3.model.hash import Hash, HashAlgorithm +from spdx_tools.spdx.model.checksum import Checksum as Spdx2_Checksum +from spdx_tools.spdx.model.checksum import ChecksumAlgorithm def bump_checksum(spdx2_checksum: Spdx2_Checksum) -> Hash: diff --git a/src/spdx3/bump_from_spdx2/creation_information.py b/src/spdx_tools/spdx3/bump_from_spdx2/creation_information.py similarity index 82% rename from src/spdx3/bump_from_spdx2/creation_information.py rename to src/spdx_tools/spdx3/bump_from_spdx2/creation_information.py index 0c1fd0ec7..68e4f1484 100644 --- a/src/spdx3/bump_from_spdx2/creation_information.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/creation_information.py @@ -6,14 +6,14 @@ from semantic_version import Version -from spdx3.bump_from_spdx2.actor import bump_actor -from spdx3.bump_from_spdx2.external_document_ref import bump_external_document_ref -from spdx3.bump_from_spdx2.message import print_missing_conversion -from spdx3.model.creation_information import CreationInformation -from spdx3.model.spdx_document import SpdxDocument -from spdx3.payload import Payload -from spdx.model.actor import ActorType -from spdx.model.document import CreationInfo as Spdx2_CreationInfo +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.payload import Payload +from spdx_tools.spdx.model.actor import ActorType +from spdx_tools.spdx.model.document import CreationInfo as Spdx2_CreationInfo def bump_creation_information(spdx2_creation_info: Spdx2_CreationInfo, payload: Payload) -> SpdxDocument: diff --git a/src/spdx3/bump_from_spdx2/external_document_ref.py b/src/spdx_tools/spdx3/bump_from_spdx2/external_document_ref.py similarity index 65% rename from src/spdx3/bump_from_spdx2/external_document_ref.py rename to src/spdx_tools/spdx3/bump_from_spdx2/external_document_ref.py index 89dd4cecc..b17b41f34 100644 --- a/src/spdx3/bump_from_spdx2/external_document_ref.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/external_document_ref.py @@ -3,10 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List -from spdx3.bump_from_spdx2.checksum import bump_checksum -from spdx3.model.external_map import ExternalMap -from spdx3.model.hash import Hash -from spdx.model.external_document_ref import ExternalDocumentRef +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.spdx.model.external_document_ref import ExternalDocumentRef def bump_external_document_ref(external_document_ref: ExternalDocumentRef) -> ExternalMap: diff --git a/src/spdx3/bump_from_spdx2/file.py b/src/spdx_tools/spdx3/bump_from_spdx2/file.py similarity index 74% rename from src/spdx3/bump_from_spdx2/file.py rename to src/spdx_tools/spdx3/bump_from_spdx2/file.py index eee707ba1..55ed3438a 100644 --- a/src/spdx3/bump_from_spdx2/file.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/file.py @@ -1,12 +1,12 @@ # SPDX-FileCopyrightText: 2023 spdx contributors # # SPDX-License-Identifier: Apache-2.0 -from spdx3.bump_from_spdx2.checksum import bump_checksum -from spdx3.bump_from_spdx2.message import print_missing_conversion -from spdx3.model.creation_information import CreationInformation -from spdx3.model.software.file import File -from spdx3.payload import Payload -from spdx.model.file import File as Spdx2_File +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.payload import Payload +from spdx_tools.spdx.model.file import File as Spdx2_File def bump_file( diff --git a/src/spdx3/bump_from_spdx2/message.py b/src/spdx_tools/spdx3/bump_from_spdx2/message.py similarity index 100% rename from src/spdx3/bump_from_spdx2/message.py rename to src/spdx_tools/spdx3/bump_from_spdx2/message.py diff --git a/src/spdx3/bump_from_spdx2/package.py b/src/spdx_tools/spdx3/bump_from_spdx2/package.py similarity index 84% rename from src/spdx3/bump_from_spdx2/package.py rename to src/spdx_tools/spdx3/bump_from_spdx2/package.py index 2b920b40a..2b3736481 100644 --- a/src/spdx3/bump_from_spdx2/package.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/package.py @@ -3,18 +3,18 @@ # SPDX-License-Identifier: Apache-2.0 from typing import Union -from spdx3.bump_from_spdx2.actor import bump_actor -from spdx3.bump_from_spdx2.bump_utils import handle_no_assertion_or_none -from spdx3.bump_from_spdx2.checksum import bump_checksum -from spdx3.bump_from_spdx2.message import print_missing_conversion -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx3.model.external_reference import ExternalReference, ExternalReferenceType -from spdx3.model.software.package import Package -from spdx3.model.software.software_purpose import SoftwarePurpose -from spdx3.payload import Payload -from spdx.model.package import ExternalPackageRef -from spdx.model.package import Package as Spdx2_Package +from spdx_tools.spdx3.bump_from_spdx2.actor import bump_actor +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.payload import Payload +from spdx_tools.spdx.model.package import ExternalPackageRef +from spdx_tools.spdx.model.package import Package as Spdx2_Package def bump_package( diff --git a/src/spdx3/bump_from_spdx2/relationship.py b/src/spdx_tools/spdx3/bump_from_spdx2/relationship.py similarity index 84% rename from src/spdx3/bump_from_spdx2/relationship.py rename to src/spdx_tools/spdx3/bump_from_spdx2/relationship.py index 42913ee0d..aa42c6a4b 100644 --- a/src/spdx3/bump_from_spdx2/relationship.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/relationship.py @@ -3,13 +3,13 @@ # SPDX-License-Identifier: Apache-2.0 from typing import Optional, Tuple -from spdx3.model.creation_information import CreationInformation -from spdx3.model.relationship import Relationship, RelationshipCompleteness, RelationshipType -from spdx3.payload import Payload -from spdx.model.relationship import Relationship as Spdx2_Relationship -from spdx.model.relationship import RelationshipType as Spdx2_RelationshipType -from spdx.model.spdx_no_assertion import SpdxNoAssertion -from spdx.model.spdx_none import SpdxNone +from spdx_tools.spdx3.model.creation_information import CreationInformation +from spdx_tools.spdx3.model.relationship import 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 +from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion +from spdx_tools.spdx.model.spdx_none import SpdxNone def bump_relationship( diff --git a/src/spdx3/bump_from_spdx2/snippet.py b/src/spdx_tools/spdx3/bump_from_spdx2/snippet.py similarity index 77% rename from src/spdx3/bump_from_spdx2/snippet.py rename to src/spdx_tools/spdx3/bump_from_spdx2/snippet.py index e05b187da..5f2ae554b 100644 --- a/src/spdx3/bump_from_spdx2/snippet.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/snippet.py @@ -1,11 +1,11 @@ # SPDX-FileCopyrightText: 2023 spdx contributors # # SPDX-License-Identifier: Apache-2.0 -from spdx3.bump_from_spdx2.message import print_missing_conversion -from spdx3.model.creation_information import CreationInformation -from spdx3.model.software.snippet import Snippet -from spdx3.payload import Payload -from spdx.model.snippet import Snippet as Spdx2_Snippet +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.payload import Payload +from spdx_tools.spdx.model.snippet import Snippet as Spdx2_Snippet def bump_snippet( diff --git a/src/spdx3/bump_from_spdx2/spdx_document.py b/src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py similarity index 70% rename from src/spdx3/bump_from_spdx2/spdx_document.py rename to src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py index 4a4544895..5a3c0a3ea 100644 --- a/src/spdx3/bump_from_spdx2/spdx_document.py +++ b/src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py @@ -1,16 +1,16 @@ # SPDX-FileCopyrightText: 2023 spdx contributors # # SPDX-License-Identifier: Apache-2.0 -from spdx3.bump_from_spdx2.annotation import bump_annotation -from spdx3.bump_from_spdx2.creation_information import bump_creation_information -from spdx3.bump_from_spdx2.file import bump_file -from spdx3.bump_from_spdx2.package import bump_package -from spdx3.bump_from_spdx2.relationship import bump_relationship -from spdx3.bump_from_spdx2.snippet import bump_snippet -from spdx3.model.creation_information import CreationInformation -from spdx3.model.spdx_document import SpdxDocument -from spdx3.payload import Payload -from spdx.model.document import Document as Spdx2_Document +from spdx_tools.spdx3.bump_from_spdx2.annotation import bump_annotation +from spdx_tools.spdx3.bump_from_spdx2.creation_information import bump_creation_information +from spdx_tools.spdx3.bump_from_spdx2.file import bump_file +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.payload import Payload +from spdx_tools.spdx.model.document import Document as Spdx2_Document """ We want to implement a bump_from_spdx2 from the data model in src.spdx to the data model in src.spdx3. As there are many fundamental differences between these version we want each bump_from_spdx2 method to take diff --git a/src/spdx3/clitools/__init__.py b/src/spdx_tools/spdx3/clitools/__init__.py similarity index 100% rename from src/spdx3/clitools/__init__.py rename to src/spdx_tools/spdx3/clitools/__init__.py diff --git a/src/spdx3/clitools/pyspdxtools3.py b/src/spdx_tools/spdx3/clitools/pyspdxtools3.py similarity index 79% rename from src/spdx3/clitools/pyspdxtools3.py rename to src/spdx_tools/spdx3/clitools/pyspdxtools3.py index 20faeb5c4..f5b00c6e1 100644 --- a/src/spdx3/clitools/pyspdxtools3.py +++ b/src/spdx_tools/spdx3/clitools/pyspdxtools3.py @@ -6,13 +6,13 @@ import click -from spdx3.bump_from_spdx2.spdx_document import bump_spdx_document -from spdx3.payload import Payload -from spdx3.writer.console.payload_writer import write_payload -from spdx.model.document import Document -from spdx.parser.parse_anything import parse_file -from spdx.validation.document_validator import validate_full_spdx_document -from spdx.validation.validation_message import ValidationMessage +from spdx_tools.spdx3.bump_from_spdx2.spdx_document import bump_spdx_document +from spdx_tools.spdx3.payload import Payload +from spdx_tools.spdx3.writer.console.payload_writer import write_payload +from spdx_tools.spdx.model.document import Document +from spdx_tools.spdx.parser.parse_anything import parse_file +from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document +from spdx_tools.spdx.validation.validation_message import ValidationMessage @click.command() diff --git a/src/spdx3/model/__init__.py b/src/spdx_tools/spdx3/model/__init__.py similarity index 100% rename from src/spdx3/model/__init__.py rename to src/spdx_tools/spdx3/model/__init__.py diff --git a/src/spdx3/model/agent.py b/src/spdx_tools/spdx3/model/agent.py similarity index 65% rename from src/spdx3/model/agent.py rename to src/spdx_tools/spdx3/model/agent.py index 2eec0b1c1..2aa29b783 100644 --- a/src/spdx3/model/agent.py +++ b/src/spdx_tools/spdx3/model/agent.py @@ -3,13 +3,13 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.creation_information import CreationInformation -from spdx3.model.element import Element -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod +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 @dataclass_with_properties diff --git a/src/spdx3/model/annotation.py b/src/spdx_tools/spdx3/model/annotation.py similarity index 73% rename from src/spdx3/model/annotation.py rename to src/spdx_tools/spdx3/model/annotation.py index 0e9132395..925233871 100644 --- a/src/spdx3/model/annotation.py +++ b/src/spdx_tools/spdx3/model/annotation.py @@ -4,13 +4,13 @@ from enum import Enum, auto from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.creation_information import CreationInformation -from spdx3.model.element import Element -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod +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 class AnnotationType(Enum): diff --git a/src/spdx3/model/artifact.py b/src/spdx_tools/spdx3/model/artifact.py similarity index 70% rename from src/spdx3/model/artifact.py rename to src/spdx_tools/spdx3/model/artifact.py index 8e4555a0f..b3270dc1e 100644 --- a/src/spdx3/model/artifact.py +++ b/src/spdx_tools/spdx3/model/artifact.py @@ -4,8 +4,8 @@ from abc import abstractmethod from typing import Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from spdx3.model.element import Element +from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties +from spdx_tools.spdx3.model.element import Element @dataclass_with_properties diff --git a/src/spdx3/model/bom.py b/src/spdx_tools/spdx3/model/bom.py similarity index 69% rename from src/spdx3/model/bom.py rename to src/spdx_tools/spdx3/model/bom.py index cf1ff35f1..1fc2d57d6 100644 --- a/src/spdx3/model/bom.py +++ b/src/spdx_tools/spdx3/model/bom.py @@ -3,15 +3,15 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.bundle import Bundle -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_map import ExternalMap -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod -from spdx3.model.namespace_map import NamespaceMap +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 @dataclass_with_properties diff --git a/src/spdx3/model/bundle.py b/src/spdx_tools/spdx3/model/bundle.py similarity index 67% rename from src/spdx3/model/bundle.py rename to src/spdx_tools/spdx3/model/bundle.py index ec531c9ad..9b0aedf48 100644 --- a/src/spdx3/model/bundle.py +++ b/src/spdx_tools/spdx3/model/bundle.py @@ -3,15 +3,15 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_map import ExternalMap -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod -from spdx3.model.namespace_map import NamespaceMap -from spdx3.model.spdx_collection import SpdxCollection +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 @dataclass_with_properties diff --git a/src/spdx3/model/creation_information.py b/src/spdx_tools/spdx3/model/creation_information.py similarity index 83% rename from src/spdx3/model/creation_information.py rename to src/spdx_tools/spdx3/model/creation_information.py index cdffd4b13..bac8c83f5 100644 --- a/src/spdx3/model/creation_information.py +++ b/src/spdx_tools/spdx3/model/creation_information.py @@ -6,8 +6,8 @@ from semantic_version import Version -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values +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 @dataclass_with_properties diff --git a/src/spdx3/model/element.py b/src/spdx_tools/spdx3/model/element.py similarity index 68% rename from src/spdx3/model/element.py rename to src/spdx_tools/spdx3/model/element.py index 50333d0ee..25ac72373 100644 --- a/src/spdx3/model/element.py +++ b/src/spdx_tools/spdx3/model/element.py @@ -5,11 +5,11 @@ from dataclasses import field from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod +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 @dataclass_with_properties diff --git a/src/spdx3/model/external_identifier.py b/src/spdx_tools/spdx3/model/external_identifier.py similarity index 81% rename from src/spdx3/model/external_identifier.py rename to src/spdx_tools/spdx3/model/external_identifier.py index 31b39db98..9131bd888 100644 --- a/src/spdx3/model/external_identifier.py +++ b/src/spdx_tools/spdx3/model/external_identifier.py @@ -4,8 +4,8 @@ from enum import Enum, auto from typing import Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values +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 class ExternalIdentifierType(Enum): diff --git a/src/spdx3/model/external_map.py b/src/spdx_tools/spdx3/model/external_map.py similarity index 74% rename from src/spdx3/model/external_map.py rename to src/spdx_tools/spdx3/model/external_map.py index 34b6542ca..ec4d7d979 100644 --- a/src/spdx3/model/external_map.py +++ b/src/spdx_tools/spdx3/model/external_map.py @@ -4,9 +4,9 @@ from dataclasses import field from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.integrity_method import IntegrityMethod +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 @dataclass_with_properties diff --git a/src/spdx3/model/external_reference.py b/src/spdx_tools/spdx3/model/external_reference.py similarity index 85% rename from src/spdx3/model/external_reference.py rename to src/spdx_tools/spdx3/model/external_reference.py index 9b574b30e..e1732ab33 100644 --- a/src/spdx3/model/external_reference.py +++ b/src/spdx_tools/spdx3/model/external_reference.py @@ -5,8 +5,8 @@ from enum import Enum, auto from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values +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 class ExternalReferenceType(Enum): diff --git a/src/spdx3/model/hash.py b/src/spdx_tools/spdx3/model/hash.py similarity index 78% rename from src/spdx3/model/hash.py rename to src/spdx_tools/spdx3/model/hash.py index 153d2b9d1..5971bfb37 100644 --- a/src/spdx3/model/hash.py +++ b/src/spdx_tools/spdx3/model/hash.py @@ -4,9 +4,9 @@ from enum import Enum, auto from typing import Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.integrity_method import IntegrityMethod +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 class HashAlgorithm(Enum): diff --git a/src/spdx3/model/integrity_method.py b/src/spdx_tools/spdx3/model/integrity_method.py similarity index 77% rename from src/spdx3/model/integrity_method.py rename to src/spdx_tools/spdx3/model/integrity_method.py index 8744c9c0a..aac00ab11 100644 --- a/src/spdx3/model/integrity_method.py +++ b/src/spdx_tools/spdx3/model/integrity_method.py @@ -4,7 +4,7 @@ from abc import ABC, abstractmethod from typing import Optional -from common.typing.dataclass_with_properties import dataclass_with_properties +from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties @dataclass_with_properties diff --git a/src/spdx3/model/namespace_map.py b/src/spdx_tools/spdx3/model/namespace_map.py similarity index 70% rename from src/spdx3/model/namespace_map.py rename to src/spdx_tools/spdx3/model/namespace_map.py index 7452d7e50..e87f62810 100644 --- a/src/spdx3/model/namespace_map.py +++ b/src/spdx_tools/spdx3/model/namespace_map.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from typing import Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values +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 @dataclass_with_properties diff --git a/src/spdx3/model/organization.py b/src/spdx_tools/spdx3/model/organization.py similarity index 66% rename from src/spdx3/model/organization.py rename to src/spdx_tools/spdx3/model/organization.py index 8c2a2e2e8..9a601c81a 100644 --- a/src/spdx3/model/organization.py +++ b/src/spdx_tools/spdx3/model/organization.py @@ -3,13 +3,13 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.agent import Agent -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod +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 @dataclass_with_properties diff --git a/src/spdx3/model/person.py b/src/spdx_tools/spdx3/model/person.py similarity index 66% rename from src/spdx3/model/person.py rename to src/spdx_tools/spdx3/model/person.py index 00f1fda5b..d69cba3a5 100644 --- a/src/spdx3/model/person.py +++ b/src/spdx_tools/spdx3/model/person.py @@ -3,13 +3,13 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.agent import Agent -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod +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 @dataclass_with_properties diff --git a/src/spdx3/model/profile_identifier.py b/src/spdx_tools/spdx3/model/profile_identifier.py similarity index 100% rename from src/spdx3/model/profile_identifier.py rename to src/spdx_tools/spdx3/model/profile_identifier.py diff --git a/src/spdx3/model/relationship.py b/src/spdx_tools/spdx3/model/relationship.py similarity index 84% rename from src/spdx3/model/relationship.py rename to src/spdx_tools/spdx3/model/relationship.py index 7d103d8a6..88284c8cc 100644 --- a/src/spdx3/model/relationship.py +++ b/src/spdx_tools/spdx3/model/relationship.py @@ -4,13 +4,13 @@ from enum import Enum, auto from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.creation_information import CreationInformation -from spdx3.model.element import Element -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod +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 class RelationshipType(Enum): diff --git a/src/spdx3/model/software/__init__.py b/src/spdx_tools/spdx3/model/software/__init__.py similarity index 100% rename from src/spdx3/model/software/__init__.py rename to src/spdx_tools/spdx3/model/software/__init__.py diff --git a/src/spdx3/model/software/file.py b/src/spdx_tools/spdx3/model/software/file.py similarity index 71% rename from src/spdx3/model/software/file.py rename to src/spdx_tools/spdx3/model/software/file.py index 4dec4fb90..1b8afbe96 100644 --- a/src/spdx3/model/software/file.py +++ b/src/spdx_tools/spdx3/model/software/file.py @@ -3,14 +3,14 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.artifact import Artifact -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod -from spdx3.model.software.software_purpose import SoftwarePurpose +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 @dataclass_with_properties diff --git a/src/spdx3/model/software/package.py b/src/spdx_tools/spdx3/model/software/package.py similarity index 75% rename from src/spdx3/model/software/package.py rename to src/spdx_tools/spdx3/model/software/package.py index 587fc70e4..c68df220e 100644 --- a/src/spdx3/model/software/package.py +++ b/src/spdx_tools/spdx3/model/software/package.py @@ -3,14 +3,14 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.artifact import Artifact -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod -from spdx3.model.software.software_purpose import SoftwarePurpose +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 @dataclass_with_properties diff --git a/src/spdx3/model/software/sbom.py b/src/spdx_tools/spdx3/model/software/sbom.py similarity index 69% rename from src/spdx3/model/software/sbom.py rename to src/spdx_tools/spdx3/model/software/sbom.py index 305c6112f..8cafed690 100644 --- a/src/spdx3/model/software/sbom.py +++ b/src/spdx_tools/spdx3/model/software/sbom.py @@ -3,15 +3,15 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.bom import Bom -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_map import ExternalMap -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod -from spdx3.model.namespace_map import NamespaceMap +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 @dataclass_with_properties diff --git a/src/spdx3/model/software/snippet.py b/src/spdx_tools/spdx3/model/software/snippet.py similarity index 72% rename from src/spdx3/model/software/snippet.py rename to src/spdx_tools/spdx3/model/software/snippet.py index 6f9f3238e..81b886873 100644 --- a/src/spdx3/model/software/snippet.py +++ b/src/spdx_tools/spdx3/model/software/snippet.py @@ -3,14 +3,14 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional, Tuple -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.artifact import Artifact -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod -from spdx3.model.software.software_purpose import SoftwarePurpose +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 @dataclass_with_properties diff --git a/src/spdx3/model/software/software_purpose.py b/src/spdx_tools/spdx3/model/software/software_purpose.py similarity index 100% rename from src/spdx3/model/software/software_purpose.py rename to src/spdx_tools/spdx3/model/software/software_purpose.py diff --git a/src/spdx3/model/software_agent.py b/src/spdx_tools/spdx3/model/software_agent.py similarity index 66% rename from src/spdx3/model/software_agent.py rename to src/spdx_tools/spdx3/model/software_agent.py index 1d6b62f7e..d3a6c05f1 100644 --- a/src/spdx3/model/software_agent.py +++ b/src/spdx_tools/spdx3/model/software_agent.py @@ -3,13 +3,13 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.agent import Agent -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod +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 @dataclass_with_properties diff --git a/src/spdx3/model/spdx_collection.py b/src/spdx_tools/spdx3/model/spdx_collection.py similarity index 73% rename from src/spdx3/model/spdx_collection.py rename to src/spdx_tools/spdx3/model/spdx_collection.py index d1c4676cb..d6a9bdcda 100644 --- a/src/spdx3/model/spdx_collection.py +++ b/src/spdx_tools/spdx3/model/spdx_collection.py @@ -5,10 +5,10 @@ from dataclasses import field from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from spdx3.model.element import Element -from spdx3.model.external_map import ExternalMap -from spdx3.model.namespace_map import NamespaceMap +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 @dataclass_with_properties diff --git a/src/spdx3/model/spdx_document.py b/src/spdx_tools/spdx3/model/spdx_document.py similarity index 70% rename from src/spdx3/model/spdx_document.py rename to src/spdx_tools/spdx3/model/spdx_document.py index 0562a2fb6..8c1a1bdf6 100644 --- a/src/spdx3/model/spdx_document.py +++ b/src/spdx_tools/spdx3/model/spdx_document.py @@ -3,15 +3,15 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.bundle import Bundle -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_map import ExternalMap -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod -from spdx3.model.namespace_map import NamespaceMap +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 @dataclass_with_properties diff --git a/src/spdx3/model/tool.py b/src/spdx_tools/spdx3/model/tool.py similarity index 65% rename from src/spdx3/model/tool.py rename to src/spdx_tools/spdx3/model/tool.py index d65fd1a35..8a10fbdd3 100644 --- a/src/spdx3/model/tool.py +++ b/src/spdx_tools/spdx3/model/tool.py @@ -3,13 +3,13 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List, Optional -from common.typing.dataclass_with_properties import dataclass_with_properties -from common.typing.type_checks import check_types_and_set_values -from spdx3.model.creation_information import CreationInformation -from spdx3.model.element import Element -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.model.external_reference import ExternalReference -from spdx3.model.integrity_method import IntegrityMethod +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 @dataclass_with_properties diff --git a/src/spdx3/payload.py b/src/spdx_tools/spdx3/payload.py similarity index 91% rename from src/spdx3/payload.py rename to src/spdx_tools/spdx3/payload.py index ff4aea6aa..b28e90a9e 100644 --- a/src/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 spdx3.model.element import Element +from spdx_tools.spdx3.model.element import Element class Payload: diff --git a/src/spdx3/writer/console/software/__init__.py b/src/spdx_tools/spdx3/writer/__init__.py similarity index 100% rename from src/spdx3/writer/console/software/__init__.py rename to src/spdx_tools/spdx3/writer/__init__.py diff --git a/src/spdx_tools/spdx3/writer/console/__init__.py b/src/spdx_tools/spdx3/writer/console/__init__.py new file mode 100644 index 000000000..7c191400b --- /dev/null +++ b/src/spdx_tools/spdx3/writer/console/__init__.py @@ -0,0 +1,2 @@ +""" This is a temporary package to write the implemented model of spdx_tools.spdx3.0 to console. As soon as + serialization formats are properly defined this package can be deleted.""" diff --git a/src/spdx3/writer/console/agent_writer.py b/src/spdx_tools/spdx3/writer/console/agent_writer.py similarity index 63% rename from src/spdx3/writer/console/agent_writer.py rename to src/spdx_tools/spdx3/writer/console/agent_writer.py index a906a8df5..58f36abfb 100644 --- a/src/spdx3/writer/console/agent_writer.py +++ b/src/spdx_tools/spdx3/writer/console/agent_writer.py @@ -3,11 +3,11 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.agent import Agent -from spdx3.model.organization import Organization -from spdx3.model.person import Person -from spdx3.model.software_agent import SoftwareAgent -from spdx3.writer.console.element_writer import write_element_properties +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.writer.console.element_writer import write_element_properties def write_agent(agent: Agent, text_output: TextIO, heading: bool = True): diff --git a/src/spdx3/writer/console/annotation_writer.py b/src/spdx_tools/spdx3/writer/console/annotation_writer.py similarity index 73% rename from src/spdx3/writer/console/annotation_writer.py rename to src/spdx_tools/spdx3/writer/console/annotation_writer.py index 92d56cc67..92d474a72 100644 --- a/src/spdx3/writer/console/annotation_writer.py +++ b/src/spdx_tools/spdx3/writer/console/annotation_writer.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.annotation import Annotation -from spdx3.writer.console.console import write_value -from spdx3.writer.console.element_writer import write_element_properties +from spdx_tools.spdx3.model.annotation import Annotation +from spdx_tools.spdx3.writer.console.console import write_value +from spdx_tools.spdx3.writer.console.element_writer import write_element_properties def write_annotation(annotation: Annotation, text_output: TextIO): diff --git a/src/spdx3/writer/console/artifact_writer.py b/src/spdx_tools/spdx3/writer/console/artifact_writer.py similarity index 60% rename from src/spdx3/writer/console/artifact_writer.py rename to src/spdx_tools/spdx3/writer/console/artifact_writer.py index 7e47d587f..5c1532dd6 100644 --- a/src/spdx3/writer/console/artifact_writer.py +++ b/src/spdx_tools/spdx3/writer/console/artifact_writer.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.artifact import Artifact -from spdx3.writer.console.console import write_value -from spdx3.writer.console.element_writer import write_element_properties +from spdx_tools.spdx3.model.artifact import Artifact +from spdx_tools.spdx3.writer.console.console import write_value +from spdx_tools.spdx3.writer.console.element_writer import write_element_properties def write_artifact_properties(artifact: Artifact, text_output: TextIO): diff --git a/src/spdx3/writer/console/bom_writer.py b/src/spdx_tools/spdx3/writer/console/bom_writer.py similarity index 71% rename from src/spdx3/writer/console/bom_writer.py rename to src/spdx_tools/spdx3/writer/console/bom_writer.py index 7e019eacc..229e95005 100644 --- a/src/spdx3/writer/console/bom_writer.py +++ b/src/spdx_tools/spdx3/writer/console/bom_writer.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.bom import Bom -from spdx3.writer.console.bundle_writer import write_bundle +from spdx_tools.spdx3.model.bom import Bom +from spdx_tools.spdx3.writer.console.bundle_writer import write_bundle def write_bom(bom: Bom, text_output: TextIO, heading: bool = True): diff --git a/src/spdx3/writer/console/bundle_writer.py b/src/spdx_tools/spdx3/writer/console/bundle_writer.py similarity index 63% rename from src/spdx3/writer/console/bundle_writer.py rename to src/spdx_tools/spdx3/writer/console/bundle_writer.py index 20818e40e..8c0384383 100644 --- a/src/spdx3/writer/console/bundle_writer.py +++ b/src/spdx_tools/spdx3/writer/console/bundle_writer.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.bundle import Bundle -from spdx3.writer.console.console import write_value -from spdx3.writer.console.spdx_collection_writer import write_collection +from spdx_tools.spdx3.model.bundle import Bundle +from spdx_tools.spdx3.writer.console.console import write_value +from spdx_tools.spdx3.writer.console.spdx_collection_writer import write_collection def write_bundle(bundle: Bundle, text_output: TextIO, heading: bool = True): diff --git a/src/spdx3/writer/console/console.py b/src/spdx_tools/spdx3/writer/console/console.py similarity index 68% rename from src/spdx3/writer/console/console.py rename to src/spdx_tools/spdx3/writer/console/console.py index fd434e796..4cb90b344 100644 --- a/src/spdx3/writer/console/console.py +++ b/src/spdx_tools/spdx3/writer/console/console.py @@ -6,8 +6,8 @@ def write_value(tag: str, value: Optional[Union[bool, str]], out: TextIO, indent: bool = False): - """This function is duplicated from spdx.writer.tagvalue.tag_value_writer_helper_functions and slightly adapted to - make indentation of output possible.""" + """This function is duplicated from spdx_tools.spdx.writer.tagvalue.tag_value_writer_helper_functions + and slightly adapted to make indentation of output possible.""" if not value: return if indent: diff --git a/src/spdx3/writer/console/creation_information_writer.py b/src/spdx_tools/spdx3/writer/console/creation_information_writer.py similarity index 81% rename from src/spdx3/writer/console/creation_information_writer.py rename to src/spdx_tools/spdx3/writer/console/creation_information_writer.py index f7790eeed..3c1a2b076 100644 --- a/src/spdx3/writer/console/creation_information_writer.py +++ b/src/spdx_tools/spdx3/writer/console/creation_information_writer.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.creation_information import CreationInformation -from spdx3.writer.console.console import write_value -from spdx.datetime_conversions import datetime_to_iso_string +from spdx_tools.spdx3.model.creation_information import CreationInformation +from spdx_tools.spdx3.writer.console.console import write_value +from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string def write_creation_info(creation_info: CreationInformation, text_output: TextIO, indent: bool = True): diff --git a/src/spdx3/writer/console/element_writer.py b/src/spdx_tools/spdx3/writer/console/element_writer.py similarity index 71% rename from src/spdx3/writer/console/element_writer.py rename to src/spdx_tools/spdx3/writer/console/element_writer.py index afc91ccdc..14b814584 100644 --- a/src/spdx3/writer/console/element_writer.py +++ b/src/spdx_tools/spdx3/writer/console/element_writer.py @@ -3,13 +3,13 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.element import Element -from spdx3.writer.console.console import write_value -from spdx3.writer.console.creation_information_writer import write_creation_info -from spdx3.writer.console.external_identifier_writer import write_external_identifier -from spdx3.writer.console.external_reference_writer import write_external_reference -from spdx3.writer.console.hash_writer import write_hash -from spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_optional_heading +from spdx_tools.spdx3.model.element 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 +from spdx_tools.spdx3.writer.console.external_reference_writer import write_external_reference +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 def write_element_properties(element: Element, text_output: TextIO): diff --git a/src/spdx3/writer/console/external_identifier_writer.py b/src/spdx_tools/spdx3/writer/console/external_identifier_writer.py similarity index 76% rename from src/spdx3/writer/console/external_identifier_writer.py rename to src/spdx_tools/spdx3/writer/console/external_identifier_writer.py index 120b783ad..f2d2db59e 100644 --- a/src/spdx3/writer/console/external_identifier_writer.py +++ b/src/spdx_tools/spdx3/writer/console/external_identifier_writer.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.external_identifier import ExternalIdentifier -from spdx3.writer.console.console import write_value +from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier +from spdx_tools.spdx3.writer.console.console import write_value def write_external_identifier(external_identifier: ExternalIdentifier, text_output: TextIO): diff --git a/src/spdx3/writer/console/external_map_writer.py b/src/spdx_tools/spdx3/writer/console/external_map_writer.py similarity index 73% rename from src/spdx3/writer/console/external_map_writer.py rename to src/spdx_tools/spdx3/writer/console/external_map_writer.py index c4dacc58b..75ab4f4a6 100644 --- a/src/spdx3/writer/console/external_map_writer.py +++ b/src/spdx_tools/spdx3/writer/console/external_map_writer.py @@ -3,10 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.external_map import ExternalMap -from spdx3.writer.console.console import write_value -from spdx3.writer.console.hash_writer import write_hash -from spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_optional_heading +from spdx_tools.spdx3.model.external_map 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 def write_external_map(external_map: ExternalMap, text_output: TextIO): diff --git a/src/spdx3/writer/console/external_reference_writer.py b/src/spdx_tools/spdx3/writer/console/external_reference_writer.py similarity index 79% rename from src/spdx3/writer/console/external_reference_writer.py rename to src/spdx_tools/spdx3/writer/console/external_reference_writer.py index c0fb4d93c..fd1e21293 100644 --- a/src/spdx3/writer/console/external_reference_writer.py +++ b/src/spdx_tools/spdx3/writer/console/external_reference_writer.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.external_reference import ExternalReference -from spdx3.writer.console.console import write_value +from spdx_tools.spdx3.model.external_reference import ExternalReference +from spdx_tools.spdx3.writer.console.console import write_value def write_external_reference(external_reference: ExternalReference, text_output: TextIO): diff --git a/src/spdx3/writer/console/hash_writer.py b/src/spdx_tools/spdx3/writer/console/hash_writer.py similarity index 70% rename from src/spdx3/writer/console/hash_writer.py rename to src/spdx_tools/spdx3/writer/console/hash_writer.py index 420d32e9f..a1e56b71a 100644 --- a/src/spdx3/writer/console/hash_writer.py +++ b/src/spdx_tools/spdx3/writer/console/hash_writer.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.hash import Hash -from spdx3.writer.console.console import write_value -from spdx3.writer.console.integrity_method_writer import write_integrity_method +from spdx_tools.spdx3.model.hash 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 def write_hash(hash_object: Hash, text_output: TextIO, heading: bool, indent: bool = True): diff --git a/src/spdx3/writer/console/integrity_method_writer.py b/src/spdx_tools/spdx3/writer/console/integrity_method_writer.py similarity index 69% rename from src/spdx3/writer/console/integrity_method_writer.py rename to src/spdx_tools/spdx3/writer/console/integrity_method_writer.py index 315952898..14b61b497 100644 --- a/src/spdx3/writer/console/integrity_method_writer.py +++ b/src/spdx_tools/spdx3/writer/console/integrity_method_writer.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.integrity_method import IntegrityMethod -from spdx3.writer.console.console import write_value +from spdx_tools.spdx3.model.integrity_method import IntegrityMethod +from spdx_tools.spdx3.writer.console.console import write_value def write_integrity_method(integrity_method: IntegrityMethod, text_output: TextIO, indent: bool = True): diff --git a/src/spdx3/writer/console/namespace_map_writer.py b/src/spdx_tools/spdx3/writer/console/namespace_map_writer.py similarity index 71% rename from src/spdx3/writer/console/namespace_map_writer.py rename to src/spdx_tools/spdx3/writer/console/namespace_map_writer.py index 5ff609eeb..4fbada5b3 100644 --- a/src/spdx3/writer/console/namespace_map_writer.py +++ b/src/spdx_tools/spdx3/writer/console/namespace_map_writer.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.namespace_map import NamespaceMap -from spdx3.writer.console.console import write_value +from spdx_tools.spdx3.model.namespace_map import NamespaceMap +from spdx_tools.spdx3.writer.console.console import write_value def write_namespace_map(namespace_map: NamespaceMap, text_output: TextIO): diff --git a/src/spdx_tools/spdx3/writer/console/payload_writer.py b/src/spdx_tools/spdx3/writer/console/payload_writer.py new file mode 100644 index 000000000..59ce9b01e --- /dev/null +++ b/src/spdx_tools/spdx3/writer/console/payload_writer.py @@ -0,0 +1,53 @@ +# SPDX-FileCopyrightText: 2023 spdx contributors +# +# 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.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 +from spdx_tools.spdx3.writer.console.bom_writer import write_bom +from spdx_tools.spdx3.writer.console.bundle_writer import write_bundle +from spdx_tools.spdx3.writer.console.relationship_writer import write_relationship +from spdx_tools.spdx3.writer.console.software.file_writer import write_file +from spdx_tools.spdx3.writer.console.software.package_writer import write_package +from spdx_tools.spdx3.writer.console.software.sbom_writer import write_sbom +from spdx_tools.spdx3.writer.console.software.snippet_writer import write_snippet +from spdx_tools.spdx3.writer.console.spdx_document_writer import write_spdx_document +from spdx_tools.spdx3.writer.console.tool_writer import write_tool + +MAP_CLASS_TO_WRITE_METHOD = { + Annotation: write_annotation, + Relationship: write_relationship, + Bundle: write_bundle, + SpdxDocument: write_spdx_document, + Bom: write_bom, + File: write_file, + Package: write_package, + Snippet: write_snippet, + Sbom: write_sbom, + Person: write_agent, + Organization: write_agent, + SoftwareAgent: write_agent, + Tool: write_tool, +} + + +def write_payload(payload: Payload, text_output: TextIO): + for element in payload.get_full_map().values(): + write_method = MAP_CLASS_TO_WRITE_METHOD[type(element)] + write_method(element, text_output) + text_output.write("\n") diff --git a/src/spdx3/writer/console/relationship_writer.py b/src/spdx_tools/spdx3/writer/console/relationship_writer.py similarity index 75% rename from src/spdx3/writer/console/relationship_writer.py rename to src/spdx_tools/spdx3/writer/console/relationship_writer.py index b83aaa919..7944e2090 100644 --- a/src/spdx3/writer/console/relationship_writer.py +++ b/src/spdx_tools/spdx3/writer/console/relationship_writer.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.relationship import Relationship -from spdx3.writer.console.console import write_value -from spdx3.writer.console.element_writer import write_element_properties +from spdx_tools.spdx3.model.relationship import Relationship +from spdx_tools.spdx3.writer.console.console import write_value +from spdx_tools.spdx3.writer.console.element_writer import write_element_properties def write_relationship(relationship: Relationship, text_output: TextIO): diff --git a/src/spdx_tools/spdx3/writer/console/software/__init__.py b/src/spdx_tools/spdx3/writer/console/software/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/spdx3/writer/console/software/file_writer.py b/src/spdx_tools/spdx3/writer/console/software/file_writer.py similarity index 70% rename from src/spdx3/writer/console/software/file_writer.py rename to src/spdx_tools/spdx3/writer/console/software/file_writer.py index 3e7e4937d..9257a0612 100644 --- a/src/spdx3/writer/console/software/file_writer.py +++ b/src/spdx_tools/spdx3/writer/console/software/file_writer.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.software.file import File -from spdx3.writer.console.artifact_writer import write_artifact_properties -from spdx3.writer.console.console import write_value +from spdx_tools.spdx3.model.software.file import File +from spdx_tools.spdx3.writer.console.artifact_writer import write_artifact_properties +from spdx_tools.spdx3.writer.console.console import write_value def write_file(file: File, text_output: TextIO): diff --git a/src/spdx3/writer/console/software/package_writer.py b/src/spdx_tools/spdx3/writer/console/software/package_writer.py similarity index 77% rename from src/spdx3/writer/console/software/package_writer.py rename to src/spdx_tools/spdx3/writer/console/software/package_writer.py index a422d18d4..4af2f5b4c 100644 --- a/src/spdx3/writer/console/software/package_writer.py +++ b/src/spdx_tools/spdx3/writer/console/software/package_writer.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.software.package import Package -from spdx3.writer.console.artifact_writer import write_artifact_properties -from spdx3.writer.console.console import write_value +from spdx_tools.spdx3.model.software.package import Package +from spdx_tools.spdx3.writer.console.artifact_writer import write_artifact_properties +from spdx_tools.spdx3.writer.console.console import write_value def write_package(package: Package, text_output: TextIO): diff --git a/src/spdx3/writer/console/software/sbom_writer.py b/src/spdx_tools/spdx3/writer/console/software/sbom_writer.py similarity index 67% rename from src/spdx3/writer/console/software/sbom_writer.py rename to src/spdx_tools/spdx3/writer/console/software/sbom_writer.py index 30f42a426..83a5b7956 100644 --- a/src/spdx3/writer/console/software/sbom_writer.py +++ b/src/spdx_tools/spdx3/writer/console/software/sbom_writer.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.software.sbom import Sbom -from spdx3.writer.console.bom_writer import write_bom +from spdx_tools.spdx3.model.software.sbom import Sbom +from spdx_tools.spdx3.writer.console.bom_writer import write_bom def write_sbom(sbom: Sbom, text_output: TextIO): diff --git a/src/spdx3/writer/console/software/snippet_writer.py b/src/spdx_tools/spdx3/writer/console/software/snippet_writer.py similarity index 66% rename from src/spdx3/writer/console/software/snippet_writer.py rename to src/spdx_tools/spdx3/writer/console/software/snippet_writer.py index 143dcd257..22415ee53 100644 --- a/src/spdx3/writer/console/software/snippet_writer.py +++ b/src/spdx_tools/spdx3/writer/console/software/snippet_writer.py @@ -3,10 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.software.snippet import Snippet -from spdx3.writer.console.artifact_writer import write_artifact_properties -from spdx3.writer.console.console import write_value -from spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_range +from spdx_tools.spdx3.model.software.snippet 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 def write_snippet(snippet: Snippet, text_output: TextIO): diff --git a/src/spdx3/writer/console/spdx_collection_writer.py b/src/spdx_tools/spdx3/writer/console/spdx_collection_writer.py similarity index 61% rename from src/spdx3/writer/console/spdx_collection_writer.py rename to src/spdx_tools/spdx3/writer/console/spdx_collection_writer.py index 72d763d56..96461c09c 100644 --- a/src/spdx3/writer/console/spdx_collection_writer.py +++ b/src/spdx_tools/spdx3/writer/console/spdx_collection_writer.py @@ -3,11 +3,11 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.spdx_collection import SpdxCollection -from spdx3.writer.console.element_writer import write_element_properties -from spdx3.writer.console.external_map_writer import write_external_map -from spdx3.writer.console.namespace_map_writer import write_namespace_map -from spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_optional_heading +from spdx_tools.spdx3.model.spdx_collection 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 +from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_optional_heading def write_collection(collection: SpdxCollection, text_output: TextIO): diff --git a/src/spdx3/writer/console/spdx_document_writer.py b/src/spdx_tools/spdx3/writer/console/spdx_document_writer.py similarity index 68% rename from src/spdx3/writer/console/spdx_document_writer.py rename to src/spdx_tools/spdx3/writer/console/spdx_document_writer.py index 0f408e63e..426421753 100644 --- a/src/spdx3/writer/console/spdx_document_writer.py +++ b/src/spdx_tools/spdx3/writer/console/spdx_document_writer.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 from typing import TextIO -from spdx3.model.spdx_document import SpdxDocument -from spdx3.writer.console.bundle_writer import write_bundle +from spdx_tools.spdx3.model.spdx_document import SpdxDocument +from spdx_tools.spdx3.writer.console.bundle_writer import write_bundle def write_spdx_document(spdx_document: SpdxDocument, text_output: TextIO): diff --git a/src/spdx3/writer/console/tool_writer.py b/src/spdx_tools/spdx3/writer/console/tool_writer.py similarity index 85% rename from src/spdx3/writer/console/tool_writer.py rename to src/spdx_tools/spdx3/writer/console/tool_writer.py index 4f20e4df3..3b2ee1560 100644 --- a/src/spdx3/writer/console/tool_writer.py +++ b/src/spdx_tools/spdx3/writer/console/tool_writer.py @@ -10,8 +10,8 @@ # limitations under the License. from typing import TextIO -from spdx3.model.tool import Tool -from spdx3.writer.console.element_writer import write_element_properties +from spdx_tools.spdx3.model.tool import Tool +from spdx_tools.spdx3.writer.console.element_writer import write_element_properties def write_tool(tool: Tool, text_output: TextIO, heading: bool = True): diff --git a/tests/spdx3/bump/test_actor_bump.py b/tests/spdx3/bump/test_actor_bump.py index a55ecf705..bc91d555b 100644 --- a/tests/spdx3/bump/test_actor_bump.py +++ b/tests/spdx3/bump/test_actor_bump.py @@ -6,14 +6,14 @@ import pytest from semantic_version import Version -from spdx3.bump_from_spdx2.actor import bump_actor -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx3.model.organization import Organization -from spdx3.model.person import Person -from spdx3.model.tool import Tool -from spdx3.payload import Payload -from spdx.model.actor import Actor, ActorType +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.payload import Payload +from spdx_tools.spdx.model.actor import Actor, ActorType @pytest.mark.parametrize( diff --git a/tests/spdx3/bump/test_bump_utils.py b/tests/spdx3/bump/test_bump_utils.py index 6c33970bf..258ab19f9 100644 --- a/tests/spdx3/bump/test_bump_utils.py +++ b/tests/spdx3/bump/test_bump_utils.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 import pytest -from spdx3.bump_from_spdx2.bump_utils import handle_no_assertion_or_none -from spdx.model.spdx_no_assertion import SpdxNoAssertion -from spdx.model.spdx_none import SpdxNone +from spdx_tools.spdx3.bump_from_spdx2.bump_utils import handle_no_assertion_or_none +from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion +from spdx_tools.spdx.model.spdx_none import SpdxNone @pytest.mark.parametrize( diff --git a/tests/spdx3/bump/test_checksum_bump.py b/tests/spdx3/bump/test_checksum_bump.py index 461b704b9..d1c167783 100644 --- a/tests/spdx3/bump/test_checksum_bump.py +++ b/tests/spdx3/bump/test_checksum_bump.py @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 import pytest -from spdx3.bump_from_spdx2.checksum import bump_checksum, convert_checksum_algorithm_to_hash_algorithm -from spdx3.model.hash import HashAlgorithm -from spdx.model.checksum import ChecksumAlgorithm +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.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 5c4193ddc..5ac6c7214 100644 --- a/tests/spdx3/bump/test_file_bump.py +++ b/tests/spdx3/bump/test_file_bump.py @@ -3,15 +3,15 @@ # SPDX-License-Identifier: Apache-2.0 from unittest import mock -from spdx3.bump_from_spdx2.file import bump_file -from spdx3.model.hash import Hash, HashAlgorithm -from spdx3.model.software.file import File -from spdx3.payload import Payload -from spdx.model.file import File as Spdx2_File +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.payload import Payload +from spdx_tools.spdx.model.file import File as Spdx2_File from tests.spdx.fixtures import file_fixture -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.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 bbfea0619..923fe6479 100644 --- a/tests/spdx3/bump/test_package_bump.py +++ b/tests/spdx3/bump/test_package_bump.py @@ -3,17 +3,17 @@ # SPDX-License-Identifier: Apache-2.0 from unittest import TestCase, mock -from spdx3.bump_from_spdx2.package import bump_package -from spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx3.model.external_reference import ExternalReference, ExternalReferenceType -from spdx3.model.software.package import Package -from spdx3.payload import Payload -from spdx.model.package import ExternalPackageRef, ExternalPackageRefCategory -from spdx.model.package import Package as Spdx2_Package +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.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("spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation") def test_bump_package(creation_information): payload = Payload() document_namespace = "https://doc.namespace" @@ -45,7 +45,7 @@ def test_bump_package(creation_information): assert package.source_info == spdx2_package.source_info -@mock.patch("spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation") def test_bump_of_single_purl_without_comment(creation_information): payload = Payload() document_namespace = "https://doc.namespace" @@ -64,7 +64,7 @@ def test_bump_of_single_purl_without_comment(creation_information): assert package.external_identifier == [] -@mock.patch("spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation") def test_bump_of_single_purl_with_comment(creation_information): payload = Payload() document_namespace = "https://doc.namespace" @@ -85,7 +85,7 @@ def test_bump_of_single_purl_with_comment(creation_information): ] -@mock.patch("spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.creation_information.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 bdc98cb63..fa2b88889 100644 --- a/tests/spdx3/bump/test_snippet_bump.py +++ b/tests/spdx3/bump/test_snippet_bump.py @@ -3,14 +3,14 @@ # SPDX-License-Identifier: Apache-2.0 from unittest import mock -from spdx3.bump_from_spdx2.snippet import bump_snippet -from spdx3.model.software.snippet import Snippet -from spdx3.payload import Payload -from spdx.model.snippet import Snippet as Spdx2_Snippet +from spdx_tools.spdx3.bump_from_spdx2.snippet import bump_snippet +from spdx_tools.spdx3.model.software.snippet 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("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) def test_bump_snippet(creation_information): payload = Payload() document_namespace = "https://doc.namespace" diff --git a/tests/spdx3/bump/test_spdx_document_bump.py b/tests/spdx3/bump/test_spdx_document_bump.py index dc18a08b6..f6a1df4fb 100644 --- a/tests/spdx3/bump/test_spdx_document_bump.py +++ b/tests/spdx3/bump/test_spdx_document_bump.py @@ -3,11 +3,11 @@ # SPDX-License-Identifier: Apache-2.0 import sys -from spdx3.bump_from_spdx2.spdx_document import bump_spdx_document -from spdx3.payload import Payload -from spdx3.writer.console.payload_writer import write_payload -from spdx.model.actor import ActorType -from spdx.model.document import Document as Spdx2_Document +from spdx_tools.spdx3.bump_from_spdx2.spdx_document import bump_spdx_document +from spdx_tools.spdx3.payload import Payload +from spdx_tools.spdx3.writer.console.payload_writer import write_payload +from spdx_tools.spdx.model.actor import ActorType +from spdx_tools.spdx.model.document import Document as Spdx2_Document from tests.spdx.fixtures import actor_fixture, annotation_fixture, creation_info_fixture, document_fixture diff --git a/tests/spdx3/model/software/test_file.py b/tests/spdx3/model/software/test_file.py index 2bed165c5..57247909f 100644 --- a/tests/spdx3/model/software/test_file.py +++ b/tests/spdx3/model/software/test_file.py @@ -5,11 +5,11 @@ import pytest -from spdx3.model.software.file import File -from spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model.software.file import File +from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) def test_correct_initialization(creation_information): file = File( "SPDXRef-File", @@ -27,7 +27,7 @@ def test_correct_initialization(creation_information): assert file.content_type == "MediaType" -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) def test_invalid_initialization(creation_information): with pytest.raises(TypeError) as err: File( @@ -43,10 +43,10 @@ def test_invalid_initialization(creation_information): 'SetterError File: type of argument "content_identifier" must be one of (str, ' "NoneType); got int instead: 3", 'SetterError File: type of argument "file_purpose" must be one of ' - "(List[spdx3.model.software.software_purpose.SoftwarePurpose], NoneType); got " - "spdx3.model.software.software_purpose.SoftwarePurpose instead: " + "(List[spdx_tools.spdx3.model.software.software_purpose.SoftwarePurpose], NoneType); got " + "spdx_tools.spdx3.model.software.software_purpose.SoftwarePurpose instead: " "SoftwarePurpose.FILE", 'SetterError File: type of argument "content_type" must be one of (str, ' - "NoneType); got spdx3.model.software.software_purpose.SoftwarePurpose " + "NoneType); got spdx_tools.spdx3.model.software.software_purpose.SoftwarePurpose " "instead: SoftwarePurpose.ARCHIVE", ] diff --git a/tests/spdx3/model/software/test_package.py b/tests/spdx3/model/software/test_package.py index 3f3b84a2e..fc9d9d0e9 100644 --- a/tests/spdx3/model/software/test_package.py +++ b/tests/spdx3/model/software/test_package.py @@ -5,11 +5,11 @@ import pytest -from spdx3.model.software.package import Package -from spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model.software.package import Package +from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) def test_correct_initialization(creation_information): package = Package( "SPDXRef-Package", @@ -34,7 +34,7 @@ def test_correct_initialization(creation_information): assert package.source_info == "some info" -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) def test_invalid_initialization(creation_information): with pytest.raises(TypeError) as err: Package( @@ -53,8 +53,8 @@ def test_invalid_initialization(creation_information): 'SetterError Package: type of argument "content_identifier" must be one of ' "(str, NoneType); got int instead: 3", 'SetterError Package: type of argument "package_purpose" must be one of ' - "(List[spdx3.model.software.software_purpose.SoftwarePurpose], NoneType); got " - "spdx3.model.software.software_purpose.SoftwarePurpose instead: " + "(List[spdx_tools.spdx3.model.software.software_purpose.SoftwarePurpose], NoneType); got " + "spdx_tools.spdx3.model.software.software_purpose.SoftwarePurpose instead: " "SoftwarePurpose.FILE", 'SetterError Package: type of argument "package_version" must be one of ' "(str, NoneType); got int instead: 42", diff --git a/tests/spdx3/model/software/test_sbom.py b/tests/spdx3/model/software/test_sbom.py index 033746980..d51ea3a8f 100644 --- a/tests/spdx3/model/software/test_sbom.py +++ b/tests/spdx3/model/software/test_sbom.py @@ -5,10 +5,10 @@ import pytest -from spdx3.model.software.sbom import Sbom +from spdx_tools.spdx3.model.software.sbom import Sbom -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) def test_correct_initialization(creation_information): sbom = Sbom("SPDXRef-Sbom", creation_information, elements=["spdx_id1", "spdx_id2"], root_elements=["spdx_id3"]) @@ -25,6 +25,6 @@ def test_invalid_initialization(): assert err.value.args[0] == [ 'SetterError Sbom: type of argument "spdx_id" must be str; got int instead: 2', 'SetterError Sbom: type of argument "creation_info" must be ' - "spdx3.model.creation_information.CreationInformation; got dict instead: " + "spdx_tools.spdx3.model.creation_information.CreationInformation; got dict instead: " "{'creation_info': [3, 4, 5]}", ] diff --git a/tests/spdx3/model/software/test_snippet.py b/tests/spdx3/model/software/test_snippet.py index 16b116fa1..f7ff9f2b9 100644 --- a/tests/spdx3/model/software/test_snippet.py +++ b/tests/spdx3/model/software/test_snippet.py @@ -5,11 +5,11 @@ import pytest -from spdx3.model.software.snippet import Snippet -from spdx3.model.software.software_purpose import SoftwarePurpose +from spdx_tools.spdx3.model.software.snippet import Snippet +from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose -@mock.patch("spdx3.model.software.snippet.Snippet", autospec=True) +@mock.patch("spdx_tools.spdx3.model.software.snippet.Snippet", autospec=True) def test_correct_initialization(creation_information): snippet = Snippet( "SPDXRef-Snippet", @@ -28,7 +28,7 @@ def test_correct_initialization(creation_information): assert snippet.line_range == (346, 456) -@mock.patch("spdx3.model.software.snippet.Snippet", autospec=True) +@mock.patch("spdx_tools.spdx3.model.software.snippet.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 5a5f72451..7eb583a28 100644 --- a/tests/spdx3/model/test_abstract_classes.py +++ b/tests/spdx3/model/test_abstract_classes.py @@ -3,10 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 import pytest -from spdx3.model.artifact import Artifact -from spdx3.model.element import Element -from spdx3.model.integrity_method import IntegrityMethod -from spdx3.model.spdx_collection import SpdxCollection +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 @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 86097e2c9..ec4cf8f00 100644 --- a/tests/spdx3/model/test_agent.py +++ b/tests/spdx3/model/test_agent.py @@ -6,12 +6,12 @@ import pytest from semantic_version import Version -from spdx3.model.agent import Agent -from spdx3.model.creation_information import CreationInformation -from spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType -from spdx3.model.organization import Organization -from spdx3.model.person import Person -from spdx3.model.software_agent import SoftwareAgent +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 @pytest.mark.parametrize("agent_class", [Agent, Person, Organization, SoftwareAgent]) @@ -37,5 +37,5 @@ def test_invalid_initialization(agent_class): assert err.value.args[0] == [ f'SetterError {agent_class.__name__}: type of argument "spdx_id" must be str; got int instead: 12', f'SetterError {agent_class.__name__}: type of argument "creation_info" must be ' - "spdx3.model.creation_information.CreationInformation; got int instead: 345", + "spdx_tools.spdx3.model.creation_information.CreationInformation; got int instead: 345", ] diff --git a/tests/spdx3/model/test_annotation.py b/tests/spdx3/model/test_annotation.py index aaf60dd71..bd8019153 100644 --- a/tests/spdx3/model/test_annotation.py +++ b/tests/spdx3/model/test_annotation.py @@ -5,10 +5,10 @@ import pytest -from spdx3.model.annotation import Annotation, AnnotationType +from spdx_tools.spdx3.model.annotation import Annotation, AnnotationType -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.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("spdx3.model.creation_information.CreationInformation") +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation") def test_invalid_initialization(creation_information): with pytest.raises(TypeError) as err: Annotation( @@ -41,7 +41,7 @@ def test_invalid_initialization(creation_information): assert err.value.args[0] == [ 'SetterError Annotation: type of argument "annotation_type" must be ' - "spdx3.model.annotation.AnnotationType; got str instead: REVIEW", + "spdx_tools.spdx3.model.annotation.AnnotationType; got str instead: REVIEW", 'SetterError Annotation: type of argument "subject" must be str; got dict ' "instead: {'element': 1}", 'SetterError Annotation: type of argument "content_type" must be one of (str, ' "NoneType); got int instead: 4", diff --git a/tests/spdx3/model/test_bom.py b/tests/spdx3/model/test_bom.py index 3f8cfed86..8e93afeae 100644 --- a/tests/spdx3/model/test_bom.py +++ b/tests/spdx3/model/test_bom.py @@ -6,10 +6,10 @@ import pytest -from spdx3.model.bom import Bom +from spdx_tools.spdx3.model.bom import Bom -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.CreationInformation", autospec=True) def test_correct_initialization(creation_information): bom = Bom("SPDXRef-Bom", creation_information, elements=["spdx_id1"], root_elements=["spdx_id2"]) @@ -26,7 +26,7 @@ def test_invalid_initialization(): assert err.value.args[0] == [ 'SetterError Bom: type of argument "spdx_id" must be str; got int instead: 1', 'SetterError Bom: type of argument "creation_info" must be ' - "spdx3.model.creation_information.CreationInformation; got str instead: " + "spdx_tools.spdx3.model.creation_information.CreationInformation; got str instead: " "Creation Information", 'SetterError Bom: type of argument "elements"[0] must be ' "str; got int instead: [5]", ] diff --git a/tests/spdx3/model/test_bundle.py b/tests/spdx3/model/test_bundle.py index 336059f27..f5a4643c2 100644 --- a/tests/spdx3/model/test_bundle.py +++ b/tests/spdx3/model/test_bundle.py @@ -5,11 +5,11 @@ import pytest -from spdx3.model.bundle import Bundle +from spdx_tools.spdx3.model.bundle import Bundle -@mock.patch("spdx3.model.namespace_map.NamespaceMap", autospec=True) -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.namespace_map.NamespaceMap", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.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("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.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"]) @@ -38,6 +38,6 @@ def test_invalid_initialization(creation_information): 'SetterError Bundle: type of argument "elements" must be a list; got str ' "instead: spdx_id1", 'SetterError Bundle: type of argument "root_elements"[0] must be str; got int ' "instead: [42]", 'SetterError Bundle: type of argument "namespaces" must be one of ' - "(List[spdx3.model.namespace_map.NamespaceMap], NoneType); got bool instead: True", + "(List[spdx_tools.spdx3.model.namespace_map.NamespaceMap], NoneType); got bool instead: True", 'SetterError Bundle: type of argument "context" must be one of (str, ' "NoneType); got list instead: ['yes']", ] diff --git a/tests/spdx3/model/test_creation_information.py b/tests/spdx3/model/test_creation_information.py index 4aab6d25f..bccb9e0f9 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 spdx3.model.creation_information import CreationInformation +from spdx_tools.spdx3.model.creation_information 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 4a90d65d7..e6f4107c4 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 spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType +from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType def test_correct_initialization(): @@ -21,7 +21,7 @@ def test_invalid_initialization(): assert err.value.args[0] == [ 'SetterError ExternalIdentifier: type of argument "external_identifier_type" ' - "must be spdx3.model.external_identifier.ExternalIdentifierType; got str " + "must be spdx_tools.spdx3.model.external_identifier.ExternalIdentifierType; got str " "instead: CPE22", 'SetterError ExternalIdentifier: type of argument "identifier" must be str; ' "got list instead: ['identifier', 'another_identifier']", diff --git a/tests/spdx3/model/test_external_map.py b/tests/spdx3/model/test_external_map.py index 606257911..9f46e83b0 100644 --- a/tests/spdx3/model/test_external_map.py +++ b/tests/spdx3/model/test_external_map.py @@ -5,10 +5,10 @@ import pytest -from spdx3.model.external_map import ExternalMap +from spdx_tools.spdx3.model.external_map import ExternalMap -@mock.patch("spdx3.model.integrity_method.IntegrityMethod", autospec=True) +@mock.patch("spdx_tools.spdx3.model.integrity_method.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 e882ddeb0..e087dac4e 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 spdx3.model.external_reference import ExternalReference, ExternalReferenceType +from spdx_tools.spdx3.model.external_reference import ExternalReference, ExternalReferenceType def test_correct_initialization(): @@ -22,7 +22,7 @@ def test_invalid_initialization(): assert err.value.args[0] == [ 'SetterError ExternalReference: type of argument "external_reference_type" ' - "must be one of (spdx3.model.external_reference.ExternalReferenceType, " + "must be one of (spdx_tools.spdx3.model.external_reference.ExternalReferenceType, " "NoneType); got str instead: OTHER", 'SetterError ExternalReference: type of argument "locator" must be a list; ' "got str instead: a URI", 'SetterError ExternalReference: type of argument "content_type" must be one ' diff --git a/tests/spdx3/model/test_hash.py b/tests/spdx3/model/test_hash.py index d383adce3..460a55747 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 spdx3.model.hash import Hash, HashAlgorithm +from spdx_tools.spdx3.model.hash import Hash, HashAlgorithm def test_correct_initialization(): @@ -19,6 +19,6 @@ def test_invalid_initialization(): assert err.value.args[0] == [ 'SetterError Hash: type of argument "algorithm" must be ' - "spdx3.model.hash.HashAlgorithm; got str instead: SHA1", + "spdx_tools.spdx3.model.hash.HashAlgorithm; got str instead: SHA1", 'SetterError Hash: type of argument "hash_value" must be str; got int ' "instead: 345", ] diff --git a/tests/spdx3/model/test_namespace_map.py b/tests/spdx3/model/test_namespace_map.py index 469753d32..a6b63ef64 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 spdx3.model.namespace_map import NamespaceMap +from spdx_tools.spdx3.model.namespace_map import NamespaceMap def test_correct_initialization(): diff --git a/tests/spdx3/model/test_relationship.py b/tests/spdx3/model/test_relationship.py index b0869d7cc..4c7d60f8a 100644 --- a/tests/spdx3/model/test_relationship.py +++ b/tests/spdx3/model/test_relationship.py @@ -5,10 +5,10 @@ import pytest -from spdx3.model.relationship import Relationship, RelationshipCompleteness, RelationshipType +from spdx_tools.spdx3.model.relationship import Relationship, RelationshipCompleteness, RelationshipType -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.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("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.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) @@ -36,8 +36,8 @@ def test_invalid_initialization(creation_information): 'SetterError Relationship: type of argument "from_element" must be ' "str; got int instead: 42", 'SetterError Relationship: type of argument "to" must be a list; got int ' "instead: 5", 'SetterError Relationship: type of argument "relationship_type" must be ' - "spdx3.model.relationship.RelationshipType; got str instead: Relationshiptype", + "spdx_tools.spdx3.model.relationship.RelationshipType; got str instead: Relationshiptype", 'SetterError Relationship: type of argument "completeness" must be one of ' - "(spdx3.model.relationship.RelationshipCompleteness, NoneType); got bool " + "(spdx_tools.spdx3.model.relationship.RelationshipCompleteness, NoneType); got bool " "instead: True", ] diff --git a/tests/spdx3/model/test_spdx_document.py b/tests/spdx3/model/test_spdx_document.py index e234414df..9e5480abc 100644 --- a/tests/spdx3/model/test_spdx_document.py +++ b/tests/spdx3/model/test_spdx_document.py @@ -5,10 +5,10 @@ import pytest -from spdx3.model.spdx_document import SpdxDocument +from spdx_tools.spdx3.model.spdx_document import SpdxDocument -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.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"] @@ -28,13 +28,13 @@ def test_invalid_initialization(): assert err.value.args[0] == [ 'SetterError SpdxDocument: type of argument "spdx_id" must be str; got int ' "instead: 1", 'SetterError SpdxDocument: type of argument "creation_info" must be ' - "spdx3.model.creation_information.CreationInformation; got dict instead: " + "spdx_tools.spdx3.model.creation_information.CreationInformation; got dict instead: " "{'info': 5}", 'SetterError SpdxDocument: type of argument "elements"[0] must be ' "str; got int instead: [8]", ] -@mock.patch("spdx3.model.creation_information.CreationInformation", autospec=True) +@mock.patch("spdx_tools.spdx3.model.creation_information.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 1a13c6032..dd54118f2 100644 --- a/tests/spdx3/model/test_tool.py +++ b/tests/spdx3/model/test_tool.py @@ -6,8 +6,8 @@ import pytest from semantic_version import Version -from spdx3.model.creation_information import CreationInformation -from spdx3.model.tool import Tool +from spdx_tools.spdx3.model.creation_information import CreationInformation +from spdx_tools.spdx3.model.tool import Tool def test_correct_initialization(): @@ -29,5 +29,5 @@ def test_invalid_initialization(): assert err.value.args[0] == [ 'SetterError Tool: type of argument "spdx_id" must be str; got int instead: 12', 'SetterError Tool: type of argument "creation_info" must be ' - "spdx3.model.creation_information.CreationInformation; got int instead: 345", + "spdx_tools.spdx3.model.creation_information.CreationInformation; got int instead: 345", ]