Skip to content

Commit 7857850

Browse files
[issue-688] replace typing with beartype.typing
this addresses warnings about possibly dropped typing support in some later python version Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
1 parent c9423f3 commit 7857850

183 files changed

Lines changed: 236 additions & 206 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/spdx_tools/common/typing/constructor_type_errors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import List
1+
from beartype.typing import List
22

33

44
class ConstructorTypeErrors(TypeError):

src/spdx_tools/common/typing/type_checks.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44
from dataclasses import fields
5-
from typing import Any, Dict
5+
6+
from beartype.typing import Any, Dict
67

78
from spdx_tools.common.typing.constructor_type_errors import ConstructorTypeErrors
89

src/spdx_tools/spdx/clitools/pyspdxtools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
# limitations under the License.
1515
import logging
1616
import sys
17-
from typing import List
1817

1918
import click
19+
from beartype.typing import List
2020

2121
from spdx_tools.spdx.graph_generation import export_graph_from_document
2222
from spdx_tools.spdx.model import Document

src/spdx_tools/spdx/document_utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44
from copy import deepcopy
5-
from typing import Any, Dict, List, Union
5+
6+
from beartype.typing import Any, Dict, List, Union
67

78
from spdx_tools.spdx.model import Document, File, Package, Snippet
89

src/spdx_tools/spdx/graph_generation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2023 spdx contributors
22
#
33
# SPDX-License-Identifier: Apache-2.0
4-
from typing import Dict, List, Union
4+
from beartype.typing import Dict, List, Union
55

66
from spdx_tools.spdx.model import File, Package, Snippet
77

src/spdx_tools/spdx/jsonschema/annotation_converter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2022 spdx contributors
22
#
33
# SPDX-License-Identifier: Apache-2.0
4-
from typing import Any, Type
4+
from beartype.typing import Any, Type
55

66
from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
77
from spdx_tools.spdx.jsonschema.annotation_properties import AnnotationProperty

src/spdx_tools/spdx/jsonschema/checksum_converter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2022 spdx contributors
22
#
33
# SPDX-License-Identifier: Apache-2.0
4-
from typing import Type
4+
from beartype.typing import Type
55

66
from spdx_tools.spdx.jsonschema.checksum_properties import ChecksumProperty
77
from spdx_tools.spdx.jsonschema.converter import TypedConverter

src/spdx_tools/spdx/jsonschema/converter.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44
from abc import ABC, abstractmethod
5-
from typing import Any, Dict, Generic, Type, TypeVar
5+
6+
from beartype.typing import Any, Dict, Generic, Type, TypeVar
67

78
from spdx_tools.spdx.casing_tools import snake_case_to_camel_case
89
from spdx_tools.spdx.jsonschema.json_property import JsonProperty

src/spdx_tools/spdx/jsonschema/creation_info_converter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2022 spdx contributors
22
#
33
# SPDX-License-Identifier: Apache-2.0
4-
from typing import Any, Type
4+
from beartype.typing import Any, Type
55

66
from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
77
from spdx_tools.spdx.jsonschema.converter import TypedConverter

src/spdx_tools/spdx/jsonschema/document_converter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2022 spdx contributors
22
#
33
# SPDX-License-Identifier: Apache-2.0
4-
from typing import Any, Type
4+
from beartype.typing import Any, Type
55

66
from spdx_tools.spdx.document_utils import get_contained_spdx_element_ids
77
from spdx_tools.spdx.jsonschema.annotation_converter import AnnotationConverter

0 commit comments

Comments
 (0)