From 570f70cb0eb1d32826644c9c50a7716e9bad77b6 Mon Sep 17 00:00:00 2001 From: Meret Behrens Date: Tue, 10 Jan 2023 13:18:48 +0100 Subject: [PATCH] move typing to common module to prepare for the prototype of spdx 3.0 Signed-off-by: Meret Behrens --- src/{spdx/model/typing => common}/__init__.py | 0 src/common/typing/__init__.py | 0 src/{spdx/model => common}/typing/constructor_type_errors.py | 0 .../model => common}/typing/dataclass_with_properties.py | 0 src/{spdx/model => common}/typing/type_checks.py | 2 +- src/spdx/model/actor.py | 4 ++-- src/spdx/model/annotation.py | 4 ++-- src/spdx/model/checksum.py | 4 ++-- src/spdx/model/document.py | 4 ++-- src/spdx/model/external_document_ref.py | 4 ++-- src/spdx/model/extracted_licensing_info.py | 4 ++-- src/spdx/model/file.py | 4 ++-- src/spdx/model/license_expression.py | 4 ++-- src/spdx/model/package.py | 4 ++-- src/spdx/model/relationship.py | 4 ++-- src/spdx/model/snippet.py | 4 ++-- src/spdx/parser/jsonlikedict/dict_parsing_functions.py | 2 +- src/spdx/parser/jsonlikedict/relationship_parser.py | 2 +- tests/spdx/jsonschema/test_converter.py | 4 ++-- 19 files changed, 27 insertions(+), 27 deletions(-) rename src/{spdx/model/typing => common}/__init__.py (100%) create mode 100644 src/common/typing/__init__.py rename src/{spdx/model => common}/typing/constructor_type_errors.py (100%) rename src/{spdx/model => common}/typing/dataclass_with_properties.py (100%) rename src/{spdx/model => common}/typing/type_checks.py (93%) diff --git a/src/spdx/model/typing/__init__.py b/src/common/__init__.py similarity index 100% rename from src/spdx/model/typing/__init__.py rename to src/common/__init__.py diff --git a/src/common/typing/__init__.py b/src/common/typing/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/spdx/model/typing/constructor_type_errors.py b/src/common/typing/constructor_type_errors.py similarity index 100% rename from src/spdx/model/typing/constructor_type_errors.py rename to src/common/typing/constructor_type_errors.py diff --git a/src/spdx/model/typing/dataclass_with_properties.py b/src/common/typing/dataclass_with_properties.py similarity index 100% rename from src/spdx/model/typing/dataclass_with_properties.py rename to src/common/typing/dataclass_with_properties.py diff --git a/src/spdx/model/typing/type_checks.py b/src/common/typing/type_checks.py similarity index 93% rename from src/spdx/model/typing/type_checks.py rename to src/common/typing/type_checks.py index b06ab5d34..71a741f04 100644 --- a/src/spdx/model/typing/type_checks.py +++ b/src/common/typing/type_checks.py @@ -1,6 +1,6 @@ from typing import Any, Dict -from spdx.model.typing.constructor_type_errors import ConstructorTypeErrors +from common.typing.constructor_type_errors import ConstructorTypeErrors def check_types_and_set_values(instance_under_construction: Any, local_variables: Dict) -> None: diff --git a/src/spdx/model/actor.py b/src/spdx/model/actor.py index f058b0b03..4dc3ac3fe 100644 --- a/src/spdx/model/actor.py +++ b/src/spdx/model/actor.py @@ -11,8 +11,8 @@ from enum import Enum, auto from typing import Optional -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.type_checks import check_types_and_set_values class ActorType(Enum): diff --git a/src/spdx/model/annotation.py b/src/spdx/model/annotation.py index 0e9d2e66b..ad44204ad 100644 --- a/src/spdx/model/annotation.py +++ b/src/spdx/model/annotation.py @@ -12,8 +12,8 @@ from enum import Enum, auto from spdx.model.actor import Actor -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.type_checks import check_types_and_set_values class AnnotationType(Enum): diff --git a/src/spdx/model/checksum.py b/src/spdx/model/checksum.py index 775892b08..94039b42e 100644 --- a/src/spdx/model/checksum.py +++ b/src/spdx/model/checksum.py @@ -10,8 +10,8 @@ # limitations under the License. from enum import auto, Enum -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.type_checks import check_types_and_set_values class ChecksumAlgorithm(Enum): diff --git a/src/spdx/model/document.py b/src/spdx/model/document.py index 1dfac798e..c5147ddcb 100644 --- a/src/spdx/model/document.py +++ b/src/spdx/model/document.py @@ -14,14 +14,14 @@ from spdx.model.actor import Actor from spdx.model.annotation import Annotation -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.dataclass_with_properties import dataclass_with_properties from spdx.model.external_document_ref import ExternalDocumentRef from spdx.model.extracted_licensing_info import ExtractedLicensingInfo from spdx.model.file import File from spdx.model.package import Package from spdx.model.relationship import Relationship from spdx.model.snippet import Snippet -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.type_checks import check_types_and_set_values from spdx.model.version import Version diff --git a/src/spdx/model/external_document_ref.py b/src/spdx/model/external_document_ref.py index 6e3b807bb..2e33ec470 100644 --- a/src/spdx/model/external_document_ref.py +++ b/src/spdx/model/external_document_ref.py @@ -10,8 +10,8 @@ # limitations under the License. from spdx.model.checksum import Checksum -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.type_checks import check_types_and_set_values @dataclass_with_properties diff --git a/src/spdx/model/extracted_licensing_info.py b/src/spdx/model/extracted_licensing_info.py index 97574b4a0..a6c9030e3 100644 --- a/src/spdx/model/extracted_licensing_info.py +++ b/src/spdx/model/extracted_licensing_info.py @@ -12,8 +12,8 @@ from typing import Optional, List, Union from spdx.model.spdx_no_assertion import SpdxNoAssertion -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.type_checks import check_types_and_set_values @dataclass_with_properties diff --git a/src/spdx/model/file.py b/src/spdx/model/file.py index 77837756b..2bfa6c0b8 100644 --- a/src/spdx/model/file.py +++ b/src/spdx/model/file.py @@ -13,11 +13,11 @@ from typing import Optional, List, Union from spdx.model.checksum import Checksum -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.dataclass_with_properties import dataclass_with_properties from spdx.model.license_expression import LicenseExpression from spdx.model.spdx_no_assertion import SpdxNoAssertion from spdx.model.spdx_none import SpdxNone -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.type_checks import check_types_and_set_values class FileType(Enum): diff --git a/src/spdx/model/license_expression.py b/src/spdx/model/license_expression.py index 291242b63..74c44fcd6 100644 --- a/src/spdx/model/license_expression.py +++ b/src/spdx/model/license_expression.py @@ -9,8 +9,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.type_checks import check_types_and_set_values @dataclass_with_properties diff --git a/src/spdx/model/package.py b/src/spdx/model/package.py index 6a1836fdd..bbeff650a 100644 --- a/src/spdx/model/package.py +++ b/src/spdx/model/package.py @@ -15,11 +15,11 @@ from spdx.model.actor import Actor from spdx.model.checksum import Checksum -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.dataclass_with_properties import dataclass_with_properties from spdx.model.license_expression import LicenseExpression from spdx.model.spdx_no_assertion import SpdxNoAssertion from spdx.model.spdx_none import SpdxNone -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.type_checks import check_types_and_set_values class PackagePurpose(Enum): diff --git a/src/spdx/model/relationship.py b/src/spdx/model/relationship.py index 6e639af70..25c9647be 100644 --- a/src/spdx/model/relationship.py +++ b/src/spdx/model/relationship.py @@ -13,8 +13,8 @@ from spdx.model.spdx_no_assertion import SpdxNoAssertion from spdx.model.spdx_none import SpdxNone -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.type_checks import check_types_and_set_values class RelationshipType(Enum): diff --git a/src/spdx/model/snippet.py b/src/spdx/model/snippet.py index 1d5fa6b46..8100502e5 100644 --- a/src/spdx/model/snippet.py +++ b/src/spdx/model/snippet.py @@ -11,11 +11,11 @@ from dataclasses import field from typing import Tuple, Optional, List, Union -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.dataclass_with_properties import dataclass_with_properties from spdx.model.license_expression import LicenseExpression from spdx.model.spdx_no_assertion import SpdxNoAssertion from spdx.model.spdx_none import SpdxNone -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.type_checks import check_types_and_set_values @dataclass_with_properties diff --git a/src/spdx/parser/jsonlikedict/dict_parsing_functions.py b/src/spdx/parser/jsonlikedict/dict_parsing_functions.py index c2cde1e9e..6414fee2a 100644 --- a/src/spdx/parser/jsonlikedict/dict_parsing_functions.py +++ b/src/spdx/parser/jsonlikedict/dict_parsing_functions.py @@ -12,7 +12,7 @@ from spdx.model.spdx_no_assertion import SpdxNoAssertion from spdx.model.spdx_none import SpdxNone -from spdx.model.typing.constructor_type_errors import ConstructorTypeErrors +from common.typing.constructor_type_errors import ConstructorTypeErrors from spdx.parser.error import SPDXParsingError from spdx.parser.logger import Logger diff --git a/src/spdx/parser/jsonlikedict/relationship_parser.py b/src/spdx/parser/jsonlikedict/relationship_parser.py index 2804eb612..2550f63c5 100644 --- a/src/spdx/parser/jsonlikedict/relationship_parser.py +++ b/src/spdx/parser/jsonlikedict/relationship_parser.py @@ -11,7 +11,7 @@ from typing import Dict, List, Optional from spdx.model.relationship import Relationship, RelationshipType -from spdx.model.typing.constructor_type_errors import ConstructorTypeErrors +from common.typing.constructor_type_errors import ConstructorTypeErrors from spdx.parser.error import SPDXParsingError from spdx.parser.jsonlikedict.dict_parsing_functions import raise_parsing_error_if_logger_has_messages, \ json_str_to_enum_name, \ diff --git a/tests/spdx/jsonschema/test_converter.py b/tests/spdx/jsonschema/test_converter.py index 7a5b4783c..daf337491 100644 --- a/tests/spdx/jsonschema/test_converter.py +++ b/tests/spdx/jsonschema/test_converter.py @@ -17,8 +17,8 @@ from spdx.jsonschema.json_property import JsonProperty from spdx.model.checksum import Checksum, ChecksumAlgorithm from spdx.model.document import Document -from spdx.model.typing.dataclass_with_properties import dataclass_with_properties -from spdx.model.typing.type_checks import check_types_and_set_values +from common.typing.dataclass_with_properties import dataclass_with_properties +from common.typing.type_checks import check_types_and_set_values class TestPropertyType(JsonProperty):