move typing to common module to prepare for the prototype of spdx 3.0

src/spdx/model/typing/type_checks.py → 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:

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):

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):

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):

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
 
 

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

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

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):

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

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):

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):

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

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
 

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, \

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):