Skip to content

Commit 389acc7

Browse files
committed
Add isort
1 parent 0e6d604 commit 389acc7

File tree

16 files changed

+124
-87
lines changed

16 files changed

+124
-87
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ $ tox -e style
5656

5757
Reformat code:
5858
```bash
59+
$ tox -e isort
5960
$ tox -e black-format
6061
```
6162

examples/example.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import datetime
22
import logging
3-
import sqlalchemy as sa
4-
from sqlalchemy import orm, exc, sql
5-
from sqlalchemy import Table, Column, Integer, String, Float, TIMESTAMP
63

4+
import sqlalchemy as sa
75
from fill_tables import fill_all_tables, to_days
8-
from models import Base, Series, Episodes
6+
from models import Base, Episodes, Series
7+
from sqlalchemy import TIMESTAMP, Column, Float, Integer, String, Table, exc, orm, sql
98

109

1110
def describe_table(engine, name):

examples/fill_tables.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import iso8601
2-
32
import sqlalchemy as sa
4-
from models import Base, Series, Seasons, Episodes
3+
from models import Base, Episodes, Seasons, Series
54

65

76
def to_days(date):

examples/models.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import sqlalchemy.orm as orm
22
from sqlalchemy import Column, Integer, Unicode
33

4-
54
Base = orm.declarative_base()
65

76

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
[tool.black]
22
line-length = 120
3+
4+
[tool.isort]
5+
profile = "black"

test-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ flake8==3.9.2
1010
black==23.3.0
1111
pytest-cov
1212
pytest-asyncio
13+
isort==5.13.2

test/test_core.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
from typing import NamedTuple
55

66
import pytest
7-
87
import sqlalchemy as sa
9-
from sqlalchemy import Table, Column, Integer, Unicode, String
10-
from sqlalchemy.testing.fixtures import TestBase, TablesTest, config
11-
128
import ydb
9+
from sqlalchemy import Column, Integer, String, Table, Unicode
10+
from sqlalchemy.testing.fixtures import TablesTest, TestBase, config
1311
from ydb._grpc.v4.protos import ydb_common_pb2
1412

15-
from ydb_sqlalchemy import dbapi, IsolationLevel
16-
from ydb_sqlalchemy.sqlalchemy import types
13+
from ydb_sqlalchemy import IsolationLevel, dbapi
1714
from ydb_sqlalchemy import sqlalchemy as ydb_sa
15+
from ydb_sqlalchemy.sqlalchemy import types
1816

1917

2018
def clear_sql(stm):

test/test_inspect.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import sqlalchemy as sa
2-
3-
from sqlalchemy import Table, Column, Integer, Unicode, Numeric
2+
from sqlalchemy import Column, Integer, Numeric, Table, Unicode
43
from sqlalchemy.testing.fixtures import TablesTest
54

65

test/test_suite.py

Lines changed: 67 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,86 @@
11
import pytest
22
import sqlalchemy as sa
33
import sqlalchemy.testing.suite.test_types
4-
4+
from sqlalchemy.testing import is_false, is_true
55
from sqlalchemy.testing.suite import * # noqa: F401, F403
6-
7-
from sqlalchemy.testing import is_true, is_false
8-
from sqlalchemy.testing.suite import eq_, testing, inspect, provide_metadata, config, requirements, fixtures
9-
from sqlalchemy.testing.suite import func, column, literal_column, select, exists
10-
from sqlalchemy.testing.suite import MetaData, Column, Table, Integer, String
11-
12-
from sqlalchemy.testing.suite.test_select import (
13-
ExistsTest as _ExistsTest,
14-
LikeFunctionsTest as _LikeFunctionsTest,
15-
CompoundSelectTest as _CompoundSelectTest,
6+
from sqlalchemy.testing.suite import (
7+
Column,
8+
Integer,
9+
MetaData,
10+
String,
11+
Table,
12+
column,
13+
config,
14+
eq_,
15+
exists,
16+
fixtures,
17+
func,
18+
inspect,
19+
literal_column,
20+
provide_metadata,
21+
requirements,
22+
select,
23+
testing,
24+
)
25+
from sqlalchemy.testing.suite.test_ddl import (
26+
LongNameBlowoutTest as _LongNameBlowoutTest,
27+
)
28+
from sqlalchemy.testing.suite.test_deprecations import (
29+
DeprecatedCompoundSelectTest as _DeprecatedCompoundSelectTest,
30+
)
31+
from sqlalchemy.testing.suite.test_dialect import (
32+
DifficultParametersTest as _DifficultParametersTest,
33+
)
34+
from sqlalchemy.testing.suite.test_dialect import EscapingTest as _EscapingTest
35+
from sqlalchemy.testing.suite.test_insert import (
36+
InsertBehaviorTest as _InsertBehaviorTest,
1637
)
1738
from sqlalchemy.testing.suite.test_reflection import (
18-
HasTableTest as _HasTableTest,
19-
HasIndexTest as _HasIndexTest,
2039
ComponentReflectionTest as _ComponentReflectionTest,
21-
CompositeKeyReflectionTest as _CompositeKeyReflectionTest,
40+
)
41+
from sqlalchemy.testing.suite.test_reflection import (
2242
ComponentReflectionTestExtra as _ComponentReflectionTestExtra,
43+
)
44+
from sqlalchemy.testing.suite.test_reflection import (
45+
CompositeKeyReflectionTest as _CompositeKeyReflectionTest,
46+
)
47+
from sqlalchemy.testing.suite.test_reflection import HasIndexTest as _HasIndexTest
48+
from sqlalchemy.testing.suite.test_reflection import HasTableTest as _HasTableTest
49+
from sqlalchemy.testing.suite.test_reflection import (
2350
QuotedNameArgumentTest as _QuotedNameArgumentTest,
2451
)
52+
from sqlalchemy.testing.suite.test_results import RowFetchTest as _RowFetchTest
53+
from sqlalchemy.testing.suite.test_select import (
54+
CompoundSelectTest as _CompoundSelectTest,
55+
)
56+
from sqlalchemy.testing.suite.test_select import ExistsTest as _ExistsTest
57+
from sqlalchemy.testing.suite.test_select import (
58+
FetchLimitOffsetTest as _FetchLimitOffsetTest,
59+
)
60+
from sqlalchemy.testing.suite.test_select import JoinTest as _JoinTest
61+
from sqlalchemy.testing.suite.test_select import LikeFunctionsTest as _LikeFunctionsTest
62+
from sqlalchemy.testing.suite.test_select import OrderByLabelTest as _OrderByLabelTest
63+
from sqlalchemy.testing.suite.test_types import BinaryTest as _BinaryTest
64+
from sqlalchemy.testing.suite.test_types import DateTest as _DateTest
2565
from sqlalchemy.testing.suite.test_types import (
26-
IntegerTest as _IntegerTest,
27-
NumericTest as _NumericTest,
28-
BinaryTest as _BinaryTest,
29-
TrueDivTest as _TrueDivTest,
30-
TimeTest as _TimeTest,
31-
StringTest as _StringTest,
32-
NativeUUIDTest as _NativeUUIDTest,
33-
TimeMicrosecondsTest as _TimeMicrosecondsTest,
3466
DateTimeCoercedToDateTimeTest as _DateTimeCoercedToDateTimeTest,
35-
DateTest as _DateTest,
67+
)
68+
from sqlalchemy.testing.suite.test_types import (
3669
DateTimeMicrosecondsTest as _DateTimeMicrosecondsTest,
37-
DateTimeTest as _DateTimeTest,
38-
TimestampMicrosecondsTest as _TimestampMicrosecondsTest,
3970
)
40-
from sqlalchemy.testing.suite.test_dialect import (
41-
EscapingTest as _EscapingTest,
42-
DifficultParametersTest as _DifficultParametersTest,
71+
from sqlalchemy.testing.suite.test_types import DateTimeTest as _DateTimeTest
72+
from sqlalchemy.testing.suite.test_types import IntegerTest as _IntegerTest
73+
from sqlalchemy.testing.suite.test_types import NativeUUIDTest as _NativeUUIDTest
74+
from sqlalchemy.testing.suite.test_types import NumericTest as _NumericTest
75+
from sqlalchemy.testing.suite.test_types import StringTest as _StringTest
76+
from sqlalchemy.testing.suite.test_types import (
77+
TimeMicrosecondsTest as _TimeMicrosecondsTest,
4378
)
44-
from sqlalchemy.testing.suite.test_select import (
45-
JoinTest as _JoinTest,
46-
OrderByLabelTest as _OrderByLabelTest,
47-
FetchLimitOffsetTest as _FetchLimitOffsetTest,
79+
from sqlalchemy.testing.suite.test_types import (
80+
TimestampMicrosecondsTest as _TimestampMicrosecondsTest,
4881
)
49-
from sqlalchemy.testing.suite.test_insert import InsertBehaviorTest as _InsertBehaviorTest
50-
from sqlalchemy.testing.suite.test_ddl import LongNameBlowoutTest as _LongNameBlowoutTest
51-
from sqlalchemy.testing.suite.test_results import RowFetchTest as _RowFetchTest
52-
from sqlalchemy.testing.suite.test_deprecations import DeprecatedCompoundSelectTest as _DeprecatedCompoundSelectTest
82+
from sqlalchemy.testing.suite.test_types import TimeTest as _TimeTest
83+
from sqlalchemy.testing.suite.test_types import TrueDivTest as _TrueDivTest
5384

5485
from ydb_sqlalchemy.sqlalchemy import types as ydb_sa_types
5586

test_dbapi/test_dbapi.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
from contextlib import suppress
2+
13
import pytest
24
import pytest_asyncio
3-
5+
import sqlalchemy.util as util
46
import ydb
5-
import ydb_sqlalchemy.dbapi as dbapi
67

7-
from contextlib import suppress
8-
import sqlalchemy.util as util
8+
import ydb_sqlalchemy.dbapi as dbapi
99

1010

1111
class BaseDBApiTestSuit:

0 commit comments

Comments
 (0)