Skip to content

Commit 1ee7d42

Browse files
Partialy fix issue pandas-dev#23334 - isort pandas/core/dtypes directory
1 parent c76173b commit 1ee7d42

File tree

9 files changed

+83
-152
lines changed

9 files changed

+83
-152
lines changed

pandas/core/dtypes/api.py

Lines changed: 13 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,19 @@
22

33
import sys
44

5-
from .common import (pandas_dtype,
6-
is_dtype_equal,
7-
is_extension_type,
8-
9-
# categorical
10-
is_categorical,
11-
is_categorical_dtype,
12-
13-
# interval
14-
is_interval,
15-
is_interval_dtype,
16-
17-
# datetimelike
18-
is_datetimetz,
19-
is_datetime64_dtype,
20-
is_datetime64tz_dtype,
21-
is_datetime64_any_dtype,
22-
is_datetime64_ns_dtype,
23-
is_timedelta64_dtype,
24-
is_timedelta64_ns_dtype,
25-
is_period,
26-
is_period_dtype,
27-
28-
# string-like
29-
is_string_dtype,
30-
is_object_dtype,
31-
32-
# sparse
33-
is_sparse,
34-
35-
# numeric types
36-
is_scalar,
37-
is_sparse,
38-
is_bool,
39-
is_integer,
40-
is_float,
41-
is_complex,
42-
is_number,
43-
is_integer_dtype,
44-
is_int64_dtype,
45-
is_numeric_dtype,
46-
is_float_dtype,
47-
is_bool_dtype,
48-
is_complex_dtype,
49-
is_signed_integer_dtype,
50-
is_unsigned_integer_dtype,
51-
52-
# like
53-
is_re,
54-
is_re_compilable,
55-
is_dict_like,
56-
is_iterator,
57-
is_file_like,
58-
is_array_like,
59-
is_list_like,
60-
is_hashable,
61-
is_named_tuple)
62-
5+
from .common import ( # categorical; interval; datetimelike; string-like; sparse; numeric types; like
6+
is_array_like, is_bool, is_bool_dtype, is_categorical,
7+
is_categorical_dtype, is_complex, is_complex_dtype,
8+
is_datetime64_any_dtype, is_datetime64_dtype, is_datetime64_ns_dtype,
9+
is_datetime64tz_dtype, is_datetimetz, is_dict_like, is_dtype_equal,
10+
is_extension_type, is_file_like, is_float, is_float_dtype, is_hashable,
11+
is_int64_dtype, is_integer, is_integer_dtype, is_interval,
12+
is_interval_dtype, is_iterator, is_list_like, is_named_tuple, is_number,
13+
is_numeric_dtype, is_object_dtype, is_period, is_period_dtype, is_re,
14+
is_re_compilable, is_scalar, is_signed_integer_dtype, is_sparse,
15+
is_string_dtype, is_timedelta64_dtype, is_timedelta64_ns_dtype,
16+
is_unsigned_integer_dtype, pandas_dtype
17+
)
6318

6419
# deprecated
6520
m = sys.modules['pandas.core.dtypes.api']

pandas/core/dtypes/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import numpy as np
33

44
from pandas import compat
5-
from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass, ABCDataFrame
5+
from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
66
from pandas.errors import AbstractMethodError
77

88

pandas/core/dtypes/cast.py

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,31 @@
11
""" routings for casting """
22

3+
import warnings
34
from datetime import datetime, timedelta
45

56
import numpy as np
6-
import warnings
77

8-
from pandas._libs import tslib, lib, tslibs
9-
from pandas._libs.tslibs import iNaT, OutOfBoundsDatetime
10-
from pandas.compat import string_types, text_type, PY3
11-
from .common import (ensure_object, is_bool, is_integer, is_float,
12-
is_complex, is_datetimetz, is_categorical_dtype,
13-
is_datetimelike,
14-
is_extension_type,
15-
is_extension_array_dtype,
16-
is_object_dtype,
17-
is_datetime64tz_dtype, is_datetime64_dtype,
18-
is_datetime64_ns_dtype,
19-
is_timedelta64_dtype, is_timedelta64_ns_dtype,
20-
is_dtype_equal,
21-
is_float_dtype, is_complex_dtype,
22-
is_integer_dtype,
23-
is_unsigned_integer_dtype,
24-
is_datetime_or_timedelta_dtype,
25-
is_bool_dtype, is_scalar,
26-
is_string_dtype, _string_dtypes,
27-
pandas_dtype,
28-
ensure_int8, ensure_int16,
29-
ensure_int32, ensure_int64,
30-
_NS_DTYPE, _TD_DTYPE, _INT64_DTYPE,
31-
_POSSIBLY_CAST_DTYPES)
32-
from .dtypes import (ExtensionDtype, PandasExtensionDtype, DatetimeTZDtype,
33-
PeriodDtype)
34-
from .generic import (ABCDatetimeIndex, ABCPeriodIndex,
35-
ABCSeries)
36-
from .missing import isna, notna
8+
from pandas._libs import lib, tslib, tslibs
9+
from pandas._libs.tslibs import OutOfBoundsDatetime, iNaT
10+
from pandas.compat import PY3, string_types, text_type
11+
12+
from .common import (
13+
_INT64_DTYPE, _NS_DTYPE, _POSSIBLY_CAST_DTYPES, _TD_DTYPE, _string_dtypes,
14+
ensure_int8, ensure_int16, ensure_int32, ensure_int64, ensure_object,
15+
is_bool, is_bool_dtype, is_categorical_dtype, is_complex, is_complex_dtype,
16+
is_datetime64_dtype, is_datetime64_ns_dtype, is_datetime64tz_dtype,
17+
is_datetime_or_timedelta_dtype, is_datetimelike, is_datetimetz,
18+
is_dtype_equal, is_extension_array_dtype, is_extension_type, is_float,
19+
is_float_dtype, is_integer, is_integer_dtype, is_object_dtype, is_scalar,
20+
is_string_dtype, is_timedelta64_dtype, is_timedelta64_ns_dtype,
21+
is_unsigned_integer_dtype, pandas_dtype
22+
)
23+
from .dtypes import (
24+
DatetimeTZDtype, ExtensionDtype, PandasExtensionDtype, PeriodDtype
25+
)
26+
from .generic import ABCDatetimeIndex, ABCPeriodIndex, ABCSeries
3727
from .inference import is_list_like
28+
from .missing import isna, notna
3829

3930
_int8_max = np.iinfo(np.int8).max
4031
_int16_max = np.iinfo(np.int16).max

pandas/core/dtypes/common.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
""" common type operations """
22
import numpy as np
3-
from pandas.compat import (string_types, text_type, binary_type,
4-
PY3, PY36)
3+
54
from pandas._libs import algos, lib
6-
from pandas._libs.tslibs import conversion, Period, Timestamp
75
from pandas._libs.interval import Interval
8-
6+
from pandas._libs.tslibs import Period, Timestamp, conversion
7+
from pandas.compat import PY3, PY36, binary_type, string_types, text_type
98
from pandas.core.dtypes.dtypes import (
10-
registry, CategoricalDtype, CategoricalDtypeType, DatetimeTZDtype,
11-
PeriodDtype, IntervalDtype,
12-
PandasExtensionDtype, ExtensionDtype,
13-
_pandas_registry)
9+
CategoricalDtype, CategoricalDtypeType, DatetimeTZDtype, ExtensionDtype,
10+
IntervalDtype, PandasExtensionDtype, PeriodDtype, _pandas_registry,
11+
registry
12+
)
1413
from pandas.core.dtypes.generic import (
15-
ABCCategorical, ABCPeriodIndex, ABCDatetimeIndex, ABCSeries,
16-
ABCSparseArray, ABCSparseSeries, ABCCategoricalIndex, ABCIndexClass,
17-
ABCDateOffset)
14+
ABCCategorical, ABCCategoricalIndex, ABCDateOffset, ABCDatetimeIndex,
15+
ABCIndexClass, ABCPeriodIndex, ABCSeries, ABCSparseArray, ABCSparseSeries
16+
)
1817
from pandas.core.dtypes.inference import ( # noqa:F401
19-
is_bool, is_integer, is_float, is_number, is_decimal, is_complex,
20-
is_re, is_re_compilable, is_dict_like, is_string_like, is_file_like,
21-
is_list_like, is_nested_list_like, is_sequence, is_named_tuple,
22-
is_hashable, is_iterator, is_array_like, is_scalar, is_interval)
18+
is_array_like, is_bool, is_complex, is_decimal, is_dict_like, is_file_like,
19+
is_float, is_hashable, is_integer, is_interval, is_iterator, is_list_like,
20+
is_named_tuple, is_nested_list_like, is_number, is_re, is_re_compilable,
21+
is_scalar, is_sequence, is_string_like
22+
)
2323

2424
_POSSIBLY_CAST_DTYPES = {np.dtype(t).name
2525
for t in ['O', 'int8', 'uint8', 'int16', 'uint16',

pandas/core/dtypes/concat.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,19 @@
33
"""
44

55
import numpy as np
6-
from pandas._libs import tslib, tslibs
6+
77
from pandas import compat
8+
from pandas._libs import tslib, tslibs
89
from pandas.core.dtypes.common import (
9-
is_categorical_dtype,
10-
is_sparse,
11-
is_extension_array_dtype,
12-
is_datetimetz,
13-
is_datetime64_dtype,
14-
is_timedelta64_dtype,
15-
is_period_dtype,
16-
is_object_dtype,
17-
is_bool_dtype,
18-
is_interval_dtype,
19-
is_dtype_equal,
20-
_NS_DTYPE,
21-
_TD_DTYPE)
10+
_NS_DTYPE, _TD_DTYPE, is_bool_dtype, is_categorical_dtype,
11+
is_datetime64_dtype, is_datetimetz, is_dtype_equal,
12+
is_extension_array_dtype, is_interval_dtype, is_object_dtype,
13+
is_period_dtype, is_sparse, is_timedelta64_dtype
14+
)
2215
from pandas.core.dtypes.generic import (
23-
ABCDatetimeIndex, ABCTimedeltaIndex,
24-
ABCPeriodIndex, ABCRangeIndex, ABCSparseDataFrame)
16+
ABCDatetimeIndex, ABCPeriodIndex, ABCRangeIndex, ABCSparseDataFrame,
17+
ABCTimedeltaIndex
18+
)
2519

2620

2721
def get_dtype_kinds(l):

pandas/core/dtypes/dtypes.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
""" define extension dtypes """
22

33
import re
4+
45
import numpy as np
6+
57
from pandas import compat
6-
from pandas.core.dtypes.generic import ABCIndexClass, ABCCategoricalIndex
7-
from pandas._libs.tslibs import Period, NaT, Timestamp
88
from pandas._libs.interval import Interval
9+
from pandas._libs.tslibs import NaT, Period, Timestamp
10+
from pandas.core.dtypes.generic import ABCCategoricalIndex, ABCIndexClass
911

1012
from .base import ExtensionDtype, _DtypeOpsMixin
1113

pandas/core/dtypes/inference.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
""" basic inference routines """
22

33
import re
4-
import numpy as np
54
from numbers import Number
5+
6+
import numpy as np
7+
68
from pandas import compat
7-
from pandas.compat import (PY2, string_types, text_type,
8-
string_and_binary_types, re_type, Set)
99
from pandas._libs import lib
10+
from pandas.compat import (
11+
PY2, Set, re_type, string_and_binary_types, string_types, text_type
12+
)
1013

1114
is_bool = lib.is_bool
1215

pandas/core/dtypes/missing.py

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,21 @@
22
missing types & inference
33
"""
44
import numpy as np
5+
56
from pandas._libs import lib, missing as libmissing
67
from pandas._libs.tslibs import NaT, iNaT
7-
from .generic import (ABCMultiIndex, ABCSeries,
8-
ABCIndexClass, ABCGeneric,
9-
ABCExtensionArray)
10-
from .common import (is_string_dtype, is_datetimelike,
11-
is_datetimelike_v_numeric, is_float_dtype,
12-
is_datetime64_dtype, is_datetime64tz_dtype,
13-
is_timedelta64_dtype,
14-
is_period_dtype,
15-
is_complex_dtype,
16-
is_string_like_dtype, is_bool_dtype,
17-
is_integer_dtype, is_dtype_equal,
18-
is_extension_array_dtype,
19-
needs_i8_conversion, ensure_object,
20-
pandas_dtype,
21-
is_scalar,
22-
is_object_dtype,
23-
is_integer,
24-
_TD_DTYPE,
25-
_NS_DTYPE)
8+
9+
from .common import (
10+
_NS_DTYPE, _TD_DTYPE, ensure_object, is_bool_dtype, is_complex_dtype,
11+
is_datetime64_dtype, is_datetime64tz_dtype, is_datetimelike,
12+
is_datetimelike_v_numeric, is_dtype_equal, is_extension_array_dtype,
13+
is_float_dtype, is_integer, is_integer_dtype, is_object_dtype,
14+
is_period_dtype, is_scalar, is_string_dtype, is_string_like_dtype,
15+
is_timedelta64_dtype, needs_i8_conversion, pandas_dtype
16+
)
17+
from .generic import (
18+
ABCExtensionArray, ABCGeneric, ABCIndexClass, ABCMultiIndex, ABCSeries
19+
)
2620
from .inference import is_list_like
2721

2822
isposinf_scalar = libmissing.isposinf_scalar

setup.cfg

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,6 @@ skip=
171171
pandas/core/tools/numeric.py,
172172
pandas/core/tools/timedeltas.py,
173173
pandas/core/tools/datetimes.py,
174-
pandas/core/dtypes/concat.py,
175-
pandas/core/dtypes/cast.py,
176-
pandas/core/dtypes/api.py,
177-
pandas/core/dtypes/dtypes.py,
178-
pandas/core/dtypes/base.py,
179-
pandas/core/dtypes/common.py,
180-
pandas/core/dtypes/missing.py,
181-
pandas/core/dtypes/inference.py,
182174
pandas/core/internals/concat.py,
183175
pandas/core/internals/managers.py,
184176
pandas/core/internals/blocks.py,

0 commit comments

Comments
 (0)