Skip to content

Commit 998c5c5

Browse files
committed
refactor: isort linter
1 parent dab54ad commit 998c5c5

File tree

13 files changed

+29
-33
lines changed

13 files changed

+29
-33
lines changed

Diff for: dbt/adapters/clickhouse/__init__.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
from typing import Optional, Type
1+
from dbt.contracts.graph.nodes import BaseNode
2+
from dbt.flags import get_flags
23

34
from dbt.adapters.base import AdapterPlugin
4-
55
from dbt.adapters.clickhouse.column import ClickHouseColumn # noqa
66
from dbt.adapters.clickhouse.connections import ClickHouseConnectionManager # noqa
77
from dbt.adapters.clickhouse.credentials import ClickHouseCredentials
88
from dbt.adapters.clickhouse.impl import ClickHouseAdapter
9+
from dbt.adapters.clickhouse.logger import logger
910
from dbt.adapters.clickhouse.relation import ClickHouseRelation # noqa
10-
from dbt.contracts.graph.nodes import BaseNode
11-
from dbt.flags import get_flags
1211
from dbt.include import clickhouse # noqa
13-
from dbt.adapters.clickhouse.logger import logger
1412

1513
Plugin = AdapterPlugin(
1614
adapter=ClickHouseAdapter,

Diff for: dbt/adapters/clickhouse/cache.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
from copy import deepcopy
44
from typing import Any, Dict, Iterable, List, Optional, Set, Tuple
55

6+
from dbt_common.events.functions import fire_event, fire_event_if
7+
68
from dbt.adapters.events.types import CacheAction, CacheDumpGraph
79
from dbt.adapters.exceptions import (
810
NewNameAlreadyInCacheError,
911
NoneRelationFoundError,
1012
TruncatedModelNameCausedCollisionError,
1113
)
12-
from dbt_common.events.functions import fire_event, fire_event_if
1314

1415
ReferenceKey = namedtuple("ReferenceKey", "schema identifier")
1516

Diff for: dbt/adapters/clickhouse/column.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
from dataclasses import dataclass, field
33
from typing import Any, List, Literal, TypeVar
44

5-
from dbt.adapters.base.column import Column
65
from dbt_common.exceptions import DbtRuntimeError
76

7+
from dbt.adapters.base.column import Column
8+
89
Self = TypeVar('Self', bound='ClickHouseColumn')
910

1011

Diff for: dbt/adapters/clickhouse/connections.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
from typing import TYPE_CHECKING, Any, Optional, Tuple, Union
55

66
import dbt.exceptions
7-
from dbt.adapters.contracts.connection import AdapterResponse, Connection
8-
from dbt.adapters.sql import SQLConnectionManager
97

108
from dbt.adapters.clickhouse.dbclient import ChRetryableException, get_db_client
119
from dbt.adapters.clickhouse.logger import logger
10+
from dbt.adapters.contracts.connection import AdapterResponse, Connection
11+
from dbt.adapters.sql import SQLConnectionManager
1212

1313
if TYPE_CHECKING:
1414
import agate

Diff for: dbt/adapters/clickhouse/credentials.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
from dataclasses import dataclass
22
from typing import Any, Dict, Optional, Union
33

4-
from dbt.adapters.contracts.connection import Credentials
54
from dbt_common.exceptions import DbtRuntimeError
65

6+
from dbt.adapters.contracts.connection import Credentials
7+
78

89
@dataclass
910
class ClickHouseCredentials(Credentials):

Diff for: dbt/adapters/clickhouse/dbclient.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from abc import ABC, abstractmethod
44
from typing import Dict
55

6-
from dbt.adapters.exceptions import FailedToConnectError
76
from dbt_common.exceptions import DbtConfigError, DbtDatabaseError
87

98
from dbt.adapters.clickhouse.credentials import ClickHouseCredentials
@@ -16,6 +15,7 @@
1615
from dbt.adapters.clickhouse.logger import logger
1716
from dbt.adapters.clickhouse.query import quote_identifier
1817
from dbt.adapters.clickhouse.util import compare_versions
18+
from dbt.adapters.exceptions import FailedToConnectError
1919

2020
LW_DELETE_SETTING = 'allow_experimental_lightweight_delete'
2121
ND_MUTATION_SETTING = 'allow_nondeterministic_mutations'

Diff for: dbt/adapters/clickhouse/httpclient.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import clickhouse_connect
44
from clickhouse_connect.driver.exceptions import DatabaseError, OperationalError
5-
from dbt.adapters.__about__ import version as dbt_adapters_version
65
from dbt_common.exceptions import DbtDatabaseError
76

7+
from dbt.adapters.__about__ import version as dbt_adapters_version
88
from dbt.adapters.clickhouse import ClickHouseColumn
99
from dbt.adapters.clickhouse.__version__ import version as dbt_clickhouse_version
1010
from dbt.adapters.clickhouse.dbclient import ChClientWrapper, ChRetryableException

Diff for: dbt/adapters/clickhouse/impl.py

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import csv
22
import io
3+
import re
34
from dataclasses import dataclass
45
from multiprocessing.context import SpawnContext
56
from typing import (
@@ -15,31 +16,27 @@
1516
Tuple,
1617
Union,
1718
)
18-
import re
1919

20-
from dbt.adapters.base import AdapterConfig, available
21-
from dbt.adapters.base.impl import BaseAdapter, ConstraintSupport
22-
from dbt.adapters.base.relation import BaseRelation, InformationSchema
23-
from dbt.adapters.capability import Capability, CapabilityDict, CapabilitySupport, Support
24-
from dbt.adapters.contracts.relation import Path, RelationConfig
25-
from dbt.adapters.events.types import ConstraintNotSupported
26-
from dbt.adapters.sql import SQLAdapter
2720
from dbt_common.contracts.constraints import ConstraintType, ModelLevelConstraint
2821
from dbt_common.events.functions import warn_or_error
2922
from dbt_common.exceptions import DbtInternalError, DbtRuntimeError, NotImplementedError
3023
from dbt_common.utils import filter_null_values
3124

25+
from dbt.adapters.base import AdapterConfig, available
26+
from dbt.adapters.base.impl import BaseAdapter, ConstraintSupport
27+
from dbt.adapters.base.relation import BaseRelation, InformationSchema
28+
from dbt.adapters.capability import Capability, CapabilityDict, CapabilitySupport, Support
3229
from dbt.adapters.clickhouse.cache import ClickHouseRelationsCache
3330
from dbt.adapters.clickhouse.column import ClickHouseColumn, ClickHouseColumnChanges
3431
from dbt.adapters.clickhouse.connections import ClickHouseConnectionManager
35-
from dbt.adapters.clickhouse.errors import (
36-
schema_change_datatype_error,
37-
schema_change_fail_error,
38-
)
32+
from dbt.adapters.clickhouse.errors import schema_change_datatype_error, schema_change_fail_error
3933
from dbt.adapters.clickhouse.logger import logger
4034
from dbt.adapters.clickhouse.query import quote_identifier
4135
from dbt.adapters.clickhouse.relation import ClickHouseRelation, ClickHouseRelationType
4236
from dbt.adapters.clickhouse.util import compare_versions
37+
from dbt.adapters.contracts.relation import Path, RelationConfig
38+
from dbt.adapters.events.types import ConstraintNotSupported
39+
from dbt.adapters.sql import SQLAdapter
4340

4441
if TYPE_CHECKING:
4542
import agate

Diff for: dbt/adapters/clickhouse/nativeclient.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import clickhouse_driver
44
import pkg_resources
55
from clickhouse_driver.errors import NetworkError, SocketTimeoutError
6-
from dbt.adapters.__about__ import version as dbt_adapters_version
76
from dbt_common.exceptions import DbtDatabaseError
87

8+
from dbt.adapters.__about__ import version as dbt_adapters_version
99
from dbt.adapters.clickhouse import ClickHouseColumn, ClickHouseCredentials
1010
from dbt.adapters.clickhouse.__version__ import version as dbt_clickhouse_version
1111
from dbt.adapters.clickhouse.dbclient import ChClientWrapper, ChRetryableException

Diff for: dbt/adapters/clickhouse/relation.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from dataclasses import dataclass, field
22
from typing import Any, Optional, Type
33

4-
from dbt.adapters.base.relation import BaseRelation, EventTimeFilter, Path, Policy, Self
5-
from dbt.adapters.contracts.relation import HasQuoting, RelationConfig
64
from dbt_common.dataclass_schema import StrEnum
75
from dbt_common.exceptions import DbtRuntimeError
86
from dbt_common.utils import deep_merge
97

8+
from dbt.adapters.base.relation import BaseRelation, EventTimeFilter, Path, Policy, Self
109
from dbt.adapters.clickhouse.query import quote_identifier
10+
from dbt.adapters.contracts.relation import HasQuoting, RelationConfig
1111

1212
NODE_TYPE_SOURCE = 'source'
1313

Diff for: tests/integration/adapter/incremental/test_incremental_microbatch.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import pytest
2-
32
from dbt.tests.adapter.incremental.test_incremental_microbatch import BaseMicrobatch
43

5-
64
_input_model_sql = """
75
{{
86
config(

Diff for: tests/integration/adapter/remote_table/test_remote_table.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import json
2+
23
import pytest
3-
from dbt.tests.util import run_dbt, run_dbt_and_capture, get_connection
4+
from dbt.tests.util import get_connection, run_dbt, run_dbt_and_capture
45

56
model = """
67
{{

Diff for: tests/integration/adapter/replicated_database/test_replicated_database.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import pytest
2-
3-
from dbt.tests.adapter.basic.test_incremental import BaseIncremental
4-
from dbt.tests.adapter.basic.test_base import BaseSimpleMaterializations
52
from dbt.tests.adapter.basic.files import model_incremental, schema_base_yml
3+
from dbt.tests.adapter.basic.test_base import BaseSimpleMaterializations
4+
from dbt.tests.adapter.basic.test_incremental import BaseIncremental
65

76

87
class TestReplicatedDatabaseSimpleMaterialization(BaseSimpleMaterializations):

0 commit comments

Comments
 (0)