Skip to content

Commit 1d07c94

Browse files
alexander-ponomarofftm9k1
authored andcommitted
Partialy fix issue pandas-dev#23334 - isort pandas/core/dtypes directory (pandas-dev#23336)
1 parent fdfecfd commit 1d07c94

File tree

9 files changed

+82
-152
lines changed

9 files changed

+82
-152
lines changed

Diff for: pandas/core/dtypes/api.py

+12-57
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,14 @@
11
# flake8: noqa
22

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

Diff for: pandas/core/dtypes/base.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
"""Extend pandas with custom array types"""
22
import numpy as np
33

4-
from pandas import compat
5-
from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass, ABCDataFrame
64
from pandas.errors import AbstractMethodError
75

6+
from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
7+
8+
from pandas import compat
9+
810

911
class _DtypeOpsMixin(object):
1012
# Not all of pandas' extension dtypes are compatibile with

Diff for: pandas/core/dtypes/cast.py

+18-29
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,25 @@
44

55
import numpy as np
66

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

3827
_int8_max = np.iinfo(np.int8).max
3928
_int16_max = np.iinfo(np.int16).max

Diff for: pandas/core/dtypes/common.py

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
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
6+
from pandas._libs.tslibs import Period, Timestamp, conversion
7+
from pandas.compat import PY3, PY36, binary_type, string_types, text_type
88

99
from pandas.core.dtypes.dtypes import (
10-
registry, CategoricalDtype, CategoricalDtypeType, DatetimeTZDtype,
11-
PeriodDtype, IntervalDtype,
12-
PandasExtensionDtype, ExtensionDtype,
13-
_pandas_registry)
10+
CategoricalDtype, CategoricalDtypeType, DatetimeTZDtype, ExtensionDtype,
11+
IntervalDtype, PandasExtensionDtype, PeriodDtype, _pandas_registry,
12+
registry)
1413
from pandas.core.dtypes.generic import (
15-
ABCCategorical, ABCPeriodIndex, ABCDatetimeIndex, ABCSeries,
16-
ABCSparseArray, ABCSparseSeries, ABCCategoricalIndex, ABCIndexClass,
17-
ABCDateOffset, ABCPeriodArray)
14+
ABCCategorical, ABCCategoricalIndex, ABCDateOffset, ABCDatetimeIndex,
15+
ABCIndexClass, ABCPeriodArray, ABCPeriodIndex, ABCSeries, ABCSparseArray,
16+
ABCSparseSeries)
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)
2322

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

Diff for: pandas/core/dtypes/concat.py

+10-16
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,19 @@
33
"""
44

55
import numpy as np
6+
67
from pandas._libs import tslib, tslibs
7-
from pandas import compat
8+
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)
2214
from pandas.core.dtypes.generic import (
23-
ABCDatetimeIndex, ABCTimedeltaIndex,
24-
ABCPeriodIndex, ABCRangeIndex, ABCSparseDataFrame)
15+
ABCDatetimeIndex, ABCPeriodIndex, ABCRangeIndex, ABCSparseDataFrame,
16+
ABCTimedeltaIndex)
17+
18+
from pandas import compat
2519

2620

2721
def get_dtype_kinds(l):

Diff for: pandas/core/dtypes/dtypes.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
""" define extension dtypes """
22

33
import re
4+
45
import numpy as np
5-
from pandas import compat
6-
from pandas.core.dtypes.generic import ABCIndexClass, ABCCategoricalIndex
7-
from pandas._libs.tslibs import Period, NaT, Timestamp
6+
87
from pandas._libs.interval import Interval
8+
from pandas._libs.tslibs import NaT, Period, Timestamp
9+
10+
from pandas.core.dtypes.generic import ABCCategoricalIndex, ABCIndexClass
11+
12+
from pandas import compat
913

1014
from .base import ExtensionDtype, _DtypeOpsMixin
1115

Diff for: pandas/core/dtypes/inference.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
""" basic inference routines """
22

3+
from numbers import Number
34
import re
5+
46
import numpy as np
5-
from numbers import Number
6-
from pandas import compat
7-
from pandas.compat import (PY2, string_types, text_type,
8-
string_and_binary_types, re_type, Set)
7+
98
from pandas._libs import lib
9+
from pandas.compat import (
10+
PY2, Set, re_type, string_and_binary_types, string_types, text_type)
11+
12+
from pandas import compat
1013

1114
is_bool = lib.is_bool
1215

Diff for: pandas/core/dtypes/missing.py

+11-19
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,19 @@
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+
from .generic import (
17+
ABCExtensionArray, ABCGeneric, ABCIndexClass, ABCMultiIndex, ABCSeries)
2618
from .inference import is_list_like
2719

2820
isposinf_scalar = libmissing.isposinf_scalar

Diff for: setup.cfg

-8
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,6 @@ skip=
149149
pandas/core/tools/numeric.py,
150150
pandas/core/tools/timedeltas.py,
151151
pandas/core/tools/datetimes.py,
152-
pandas/core/dtypes/concat.py,
153-
pandas/core/dtypes/cast.py,
154-
pandas/core/dtypes/api.py,
155-
pandas/core/dtypes/dtypes.py,
156-
pandas/core/dtypes/base.py,
157-
pandas/core/dtypes/common.py,
158-
pandas/core/dtypes/missing.py,
159-
pandas/core/dtypes/inference.py,
160152
pandas/core/internals/concat.py,
161153
pandas/core/internals/managers.py,
162154
pandas/core/internals/blocks.py,

0 commit comments

Comments
 (0)