Skip to content

Commit 4b016b1

Browse files
committed
isort
1 parent 4dd40ca commit 4b016b1

File tree

7 files changed

+33
-48
lines changed

7 files changed

+33
-48
lines changed

confection/__init__.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
11
import re
2-
from typing import (
3-
Any,
4-
Dict,
5-
Union,
6-
)
2+
from typing import Any, Dict, Union
73

84
import srsly
9-
105
from pydantic import BaseModel
116
from pydantic.fields import Field as ModelField
127

13-
from .util import SimpleFrozenDict, SimpleFrozenList # noqa: F401
14-
from ._errors import ConfigValidationError
15-
from ._registry import registry
168
from ._config import (
17-
Config,
18-
VARIABLE_RE,
199
ARGS_FIELD,
2010
ARGS_FIELD_ALIAS,
11+
JSON_EXCEPTIONS,
2112
RESERVED_FIELDS,
2213
SECTION_PREFIX,
23-
JSON_EXCEPTIONS,
24-
try_load_json,
14+
VARIABLE_RE,
15+
Config,
2516
try_dump_json,
17+
try_load_json,
2618
)
19+
from ._errors import ConfigValidationError
20+
from ._registry import registry
21+
from .util import SimpleFrozenDict, SimpleFrozenList # noqa: F401
2722

2823

2924
def alias_generator(name: str) -> str:

confection/_config.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,13 @@
1414
ParsingError,
1515
)
1616
from pathlib import Path
17-
from typing import (
18-
Any,
19-
Dict,
20-
List,
21-
Optional,
22-
Tuple,
23-
Union,
24-
cast,
25-
)
17+
from typing import Any, Dict, List, Optional, Tuple, Union, cast
2618

2719
import srsly
20+
2821
from ._errors import ConfigValidationError
2922
from .util import is_promise
3023

31-
3224
# Field used for positional arguments, e.g. [section.*.xyz]. The alias is
3325
# required for the schema (shouldn't clash with user-defined arg names)
3426
ARGS_FIELD = "*"

confection/_registry.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
1+
import copy
2+
import inspect
3+
import json
4+
from dataclasses import dataclass
15
from typing import (
26
Any,
3-
Union,
7+
Callable,
48
Dict,
9+
Generic,
510
List,
6-
Tuple,
7-
Type,
11+
Literal,
812
Optional,
913
Sequence,
14+
Tuple,
15+
Type,
1016
TypeVar,
11-
Generic,
12-
Callable,
13-
Literal,
17+
Union,
1418
)
15-
import json
19+
1620
import catalogue
17-
import inspect
18-
from dataclasses import dataclass
19-
from pydantic import BaseModel, ValidationError, ConfigDict, create_model, Field
21+
from pydantic import BaseModel, ConfigDict, Field, ValidationError, create_model
2022
from pydantic.fields import FieldInfo
21-
import copy
22-
from ._errors import ConfigValidationError
23+
2324
from ._config import (
24-
Config,
2525
ARGS_FIELD,
2626
ARGS_FIELD_ALIAS,
2727
RESERVED_FIELDS,
2828
RESERVED_FIELDS_REVERSE,
29+
Config,
2930
)
31+
from ._errors import ConfigValidationError
3032
from .util import is_promise
3133

32-
3334
_PromisedType = TypeVar("_PromisedType")
3435

3536

confection/tests/test_config.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
Dict,
99
Iterable,
1010
List,
11+
Literal,
1112
Optional,
13+
Sequence,
1214
Tuple,
1315
Union,
14-
Sequence,
15-
Literal,
1616
)
1717

1818
import catalogue
1919
import pytest
20-
21-
from pydantic import BaseModel, StrictFloat, PositiveInt, constr
20+
from pydantic import BaseModel, PositiveInt, StrictFloat, constr
2221
from pydantic.types import StrictBool
2322

2423
from confection import Config, ConfigValidationError

confection/tests/test_registry.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
Dict,
99
Iterable,
1010
List,
11+
Literal,
1112
Optional,
13+
Sequence,
1214
Tuple,
1315
Union,
14-
Sequence,
15-
Literal,
1616
)
1717

1818
import catalogue
1919
import pytest
20-
21-
from pydantic import BaseModel, StrictFloat, PositiveInt, constr
20+
from pydantic import BaseModel, PositiveInt, StrictFloat, constr
2221
from pydantic.types import StrictBool
2322

2423
from confection import Config, ConfigValidationError, EmptySchema

confection/tests/util.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from typing import Generator, Generic, Iterable, List, Optional, TypeVar, Union
1010

1111
import catalogue
12-
1312
from pydantic.types import StrictBool # type: ignore
1413

1514
import confection

confection/util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
import sys
33
from copy import deepcopy
44
from typing import Any, Callable, Iterator, TypeVar
5-
from pydantic_core import core_schema
6-
from pydantic import GetCoreSchemaHandler
75

6+
from pydantic import GetCoreSchemaHandler
7+
from pydantic_core import core_schema
88

99
if sys.version_info < (3, 8):
1010
# Ignoring type for mypy to avoid "Incompatible import" error (https://github.com/python/mypy/issues/4427).

0 commit comments

Comments
 (0)