Skip to content

Commit 0ee7f12

Browse files
authored
Decouple imports reported by mypy linter (#519)
1 parent a48a001 commit 0ee7f12

File tree

11 files changed

+14
-15
lines changed

11 files changed

+14
-15
lines changed

pyiceberg/avro/file.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
TypeVar,
3636
)
3737

38-
from pyiceberg.avro.codecs import KNOWN_CODECS, Codec
38+
from pyiceberg.avro.codecs import KNOWN_CODECS
39+
from pyiceberg.avro.codecs.codec import Codec
3940
from pyiceberg.avro.decoder import BinaryDecoder, new_decoder
4041
from pyiceberg.avro.encoder import BinaryEncoder
4142
from pyiceberg.avro.reader import Reader

pyiceberg/catalog/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
CommitTableRequest,
4747
CommitTableResponse,
4848
Table,
49-
TableMetadata,
5049
)
50+
from pyiceberg.table.metadata import TableMetadata
5151
from pyiceberg.table.sorting import UNSORTED_SORT_ORDER, SortOrder
5252
from pyiceberg.typedef import (
5353
EMPTY_DICT,

pyiceberg/catalog/dynamodb.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
PREVIOUS_METADATA_LOCATION,
3535
TABLE_TYPE,
3636
Catalog,
37-
Identifier,
38-
Properties,
3937
PropertiesUpdateSummary,
4038
)
4139
from pyiceberg.exceptions import (
@@ -56,7 +54,7 @@
5654
from pyiceberg.table import CommitTableRequest, CommitTableResponse, Table
5755
from pyiceberg.table.metadata import new_table_metadata
5856
from pyiceberg.table.sorting import UNSORTED_SORT_ORDER, SortOrder
59-
from pyiceberg.typedef import EMPTY_DICT
57+
from pyiceberg.typedef import EMPTY_DICT, Identifier, Properties
6058

6159
if TYPE_CHECKING:
6260
import pyarrow as pa

pyiceberg/catalog/rest.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
URI,
3939
WAREHOUSE_LOCATION,
4040
Catalog,
41-
Identifier,
42-
Properties,
4341
PropertiesUpdateSummary,
4442
)
4543
from pyiceberg.exceptions import (
@@ -68,7 +66,7 @@
6866
)
6967
from pyiceberg.table.metadata import TableMetadata
7068
from pyiceberg.table.sorting import UNSORTED_SORT_ORDER, SortOrder, assign_fresh_sort_order_ids
71-
from pyiceberg.typedef import EMPTY_DICT, UTF8, IcebergBaseModel
69+
from pyiceberg.typedef import EMPTY_DICT, UTF8, IcebergBaseModel, Identifier, Properties
7270
from pyiceberg.types import transform_dict_value_to_str
7371

7472
if TYPE_CHECKING:

pyiceberg/cli/output.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131

3232
from pyiceberg.partitioning import PartitionSpec
3333
from pyiceberg.schema import Schema
34-
from pyiceberg.table import Table, TableMetadata
34+
from pyiceberg.table import Table
35+
from pyiceberg.table.metadata import TableMetadata
3536
from pyiceberg.table.refs import SnapshotRefType
3637
from pyiceberg.typedef import IcebergBaseModel, Identifier, Properties
3738

pyiceberg/io/pyarrow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
)
7070
from sortedcontainers import SortedList
7171

72-
from pyiceberg.avro.resolver import ResolveError
7372
from pyiceberg.conversions import to_bytes
73+
from pyiceberg.exceptions import ResolveError
7474
from pyiceberg.expressions import (
7575
AlwaysTrue,
7676
BooleanExpression,

pyiceberg/table/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
from pyiceberg.partitioning import (
7272
INITIAL_PARTITION_SPEC_ID,
7373
PARTITION_FIELD_ID_START,
74-
IdentityTransform,
7574
PartitionField,
7675
PartitionSpec,
7776
_PartitionNameGenerator,
@@ -108,7 +107,7 @@
108107
update_snapshot_summaries,
109108
)
110109
from pyiceberg.table.sorting import SortOrder
111-
from pyiceberg.transforms import TimeTransform, Transform, VoidTransform
110+
from pyiceberg.transforms import IdentityTransform, TimeTransform, Transform, VoidTransform
112111
from pyiceberg.typedef import (
113112
EMPTY_DICT,
114113
IcebergBaseModel,

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ warn_unreachable = true
149149
warn_unused_ignores = true
150150
disallow_any_generics = true
151151
disallow_untyped_defs = true
152+
implicit_reexport = false
152153

153154
[[tool.mypy.overrides]]
154155
module = "pyarrow.*"

tests/avro/test_file.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from fastavro import reader, writer
2727

2828
import pyiceberg.avro.file as avro
29-
from pyiceberg.avro.codecs import DeflateCodec
29+
from pyiceberg.avro.codecs.deflate import DeflateCodec
3030
from pyiceberg.avro.file import META_SCHEMA, AvroFileHeader
3131
from pyiceberg.io.pyarrow import PyArrowFileIO
3232
from pyiceberg.manifest import (

tests/avro/test_resolver.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
StringReader,
3333
StructReader,
3434
)
35-
from pyiceberg.avro.resolver import ResolveError, resolve_reader, resolve_writer
35+
from pyiceberg.avro.resolver import resolve_reader, resolve_writer
3636
from pyiceberg.avro.writer import (
3737
BinaryWriter,
3838
DefaultWriter,
@@ -44,6 +44,7 @@
4444
StringWriter,
4545
StructWriter,
4646
)
47+
from pyiceberg.exceptions import ResolveError
4748
from pyiceberg.io.pyarrow import PyArrowFileIO
4849
from pyiceberg.manifest import MANIFEST_ENTRY_SCHEMAS
4950
from pyiceberg.schema import Schema

0 commit comments

Comments
 (0)