8000 [issue_592] add top-level package by meretp · Pull Request #596 · spdx/tools-python · GitHub
[go: up one dir, main page]
Skip to content

[issue_592] add top-level package #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2023
Merged

[issue_592] add top-level package #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[issue_592] add top-level package 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
  • Loading branch information
@meretp
meretp committed Apr 19, 2023
commit ac17889147ba02b60fa92057d6a76afebffc6a0b
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/spdx3/writer/console/__init__.py
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions src/spdx3/writer/console/payload_writer.py
View file
Open in desktop

This file was deleted.

0 src/spdx3/README.md → src/spdx_tools/spdx3/README.md
View file
Open in desktop
File renamed without changes.
0 src/spdx3/__init__.py → src/spdx_tools/spdx3/__init__.py
View file
Open in desktop
File renamed without changes.
0 src/spdx3/bump_from_spdx2/__init__.py → ...x_tools/spdx3/bump_from_spdx2/__init__.py
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions src/spdx3/bump_from_spdx2/actor.py → ...spdx_tools/spdx3/bump_from_spdx2/actor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
12 changes: 6 additions & 6 deletions src/spdx3/bump_from_spdx2/annotation.py → ...tools/spdx3/bump_from_spdx2/annotation.py
View file
Open in desktop
1C6A
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions src/spdx3/bump_from_spdx2/bump_utils.py → ...tools/spdx3/bump_from_spdx2/bump_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]:
Expand Down
6 changes: 3 additions & 3 deletions src/spdx3/bump_from_spdx2/checksum.py → ...x_tools/spdx3/bump_from_spdx2/checksum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
16 changes: 8 additions & 8 deletions ...3/bump_from_spdx2/creation_information.py → ...3/bump_from_spdx2/creation_information.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .../bump_from_spdx2/external_document_ref.py → .../bump_from_spdx2/external_document_ref.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions src/spdx3/bump_from_spdx2/file.py → src/spdx_tools/spdx3/bump_from_spdx2/file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
0 src/spdx3/bump_from_spdx2/message.py → ...dx_tools/spdx3/bump_from_spdx2/message.py
View file
Open in desktop
File renamed without changes.
24 changes: 12 additions & 12 deletions src/spdx3/bump_from_spdx2/package.py → ...dx_tools/spdx3/bump_from_spdx2/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
14 changes: 7 additions & 7 deletions src/spdx3/bump_from_spdx2/relationship.py → ...ols/spdx3/bump_from_spdx2/relationship.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
10 changes: 5 additions & 5 deletions src/spdx3/bump_from_spdx2/snippet.py → ...dx_tools/spdx3/bump_from_spdx2/snippet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
20 changes: 10 additions & 10 deletions src/spdx3/bump_from_spdx2/spdx_document.py → ...ls/spdx3/bump_from_spdx2/spdx_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 src/spdx3/clitools/__init__.py → src/spdx_tools/spdx3/clitools/__init__.py
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions src/spdx3/clitools/pyspdxtools3.py → ...spdx_tools/spdx3/clitools/pyspdxtools3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
0 src/spdx3/model/__init__.py → src/spdx_tools/spdx3/model/__init__.py
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions src/spdx3/model/agent.py → src/spdx_tools/spdx3/model/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions src/spdx3/model/annotation.py → src/spdx_tools/spdx3/model/annotation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions src/spdx3/model/artifact.py → src/spdx_tools/spdx3/model/artifact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions src/spdx3/model/bom.py → src/spdx_tools/spdx3/model/bom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
0