Skip to content

Commit

Permalink
Partialy fix issue pandas-dev#23334 - isort pandas/core/dtypes directory
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-ponomaroff committed Oct 25, 2018
1 parent c76173b commit 1ee7d42
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 152 deletions.
71 changes: 13 additions & 58 deletions pandas/core/dtypes/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,19 @@

import sys

from .common import (pandas_dtype,
is_dtype_equal,
is_extension_type,

# categorical
is_categorical,
is_categorical_dtype,

# interval
is_interval,
is_interval_dtype,

# datetimelike
is_datetimetz,
is_datetime64_dtype,
is_datetime64tz_dtype,
is_datetime64_any_dtype,
is_datetime64_ns_dtype,
is_timedelta64_dtype,
is_timedelta64_ns_dtype,
is_period,
is_period_dtype,

# string-like
is_string_dtype,
is_object_dtype,

# sparse
is_sparse,

# numeric types
is_scalar,
is_sparse,
is_bool,
is_integer,
is_float,
is_complex,
is_number,
is_integer_dtype,
is_int64_dtype,
is_numeric_dtype,
is_float_dtype,
is_bool_dtype,
is_complex_dtype,
is_signed_integer_dtype,
is_unsigned_integer_dtype,

# like
is_re,
is_re_compilable,
is_dict_like,
is_iterator,
is_file_like,
is_array_like,
is_list_like,
is_hashable,
is_named_tuple)

from .common import ( # categorical; interval; datetimelike; string-like; sparse; numeric types; like
is_array_like, is_bool, is_bool_dtype, is_categorical,
is_categorical_dtype, is_complex, is_complex_dtype,
is_datetime64_any_dtype, is_datetime64_dtype, is_datetime64_ns_dtype,
is_datetime64tz_dtype, is_datetimetz, is_dict_like, is_dtype_equal,
is_extension_type, is_file_like, is_float, is_float_dtype, is_hashable,
is_int64_dtype, is_integer, is_integer_dtype, is_interval,
is_interval_dtype, is_iterator, is_list_like, is_named_tuple, is_number,
is_numeric_dtype, is_object_dtype, is_period, is_period_dtype, is_re,
is_re_compilable, is_scalar, is_signed_integer_dtype, is_sparse,
is_string_dtype, is_timedelta64_dtype, is_timedelta64_ns_dtype,
is_unsigned_integer_dtype, pandas_dtype
)

# deprecated
m = sys.modules['pandas.core.dtypes.api']
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/dtypes/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy as np

from pandas import compat
from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass, ABCDataFrame
from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
from pandas.errors import AbstractMethodError


Expand Down
51 changes: 21 additions & 30 deletions pandas/core/dtypes/cast.py
Original file line number Diff line number Diff line change
@@ -1,40 +1,31 @@
""" routings for casting """

import warnings
from datetime import datetime, timedelta

import numpy as np
import warnings

from pandas._libs import tslib, lib, tslibs
from pandas._libs.tslibs import iNaT, OutOfBoundsDatetime
from pandas.compat import string_types, text_type, PY3
from .common import (ensure_object, is_bool, is_integer, is_float,
is_complex, is_datetimetz, is_categorical_dtype,
is_datetimelike,
is_extension_type,
is_extension_array_dtype,
is_object_dtype,
is_datetime64tz_dtype, is_datetime64_dtype,
is_datetime64_ns_dtype,
is_timedelta64_dtype, is_timedelta64_ns_dtype,
is_dtype_equal,
is_float_dtype, is_complex_dtype,
is_integer_dtype,
is_unsigned_integer_dtype,
is_datetime_or_timedelta_dtype,
is_bool_dtype, is_scalar,
is_string_dtype, _string_dtypes,
pandas_dtype,
ensure_int8, ensure_int16,
ensure_int32, ensure_int64,
_NS_DTYPE, _TD_DTYPE, _INT64_DTYPE,
_POSSIBLY_CAST_DTYPES)
from .dtypes import (ExtensionDtype, PandasExtensionDtype, DatetimeTZDtype,
PeriodDtype)
from .generic import (ABCDatetimeIndex, ABCPeriodIndex,
ABCSeries)
from .missing import isna, notna
from pandas._libs import lib, tslib, tslibs
from pandas._libs.tslibs import OutOfBoundsDatetime, iNaT
from pandas.compat import PY3, string_types, text_type

from .common import (
_INT64_DTYPE, _NS_DTYPE, _POSSIBLY_CAST_DTYPES, _TD_DTYPE, _string_dtypes,
ensure_int8, ensure_int16, ensure_int32, ensure_int64, ensure_object,
is_bool, is_bool_dtype, is_categorical_dtype, is_complex, is_complex_dtype,
is_datetime64_dtype, is_datetime64_ns_dtype, is_datetime64tz_dtype,
is_datetime_or_timedelta_dtype, is_datetimelike, is_datetimetz,
is_dtype_equal, is_extension_array_dtype, is_extension_type, is_float,
is_float_dtype, is_integer, is_integer_dtype, is_object_dtype, is_scalar,
is_string_dtype, is_timedelta64_dtype, is_timedelta64_ns_dtype,
is_unsigned_integer_dtype, pandas_dtype
)
from .dtypes import (
DatetimeTZDtype, ExtensionDtype, PandasExtensionDtype, PeriodDtype
)
from .generic import ABCDatetimeIndex, ABCPeriodIndex, ABCSeries
from .inference import is_list_like
from .missing import isna, notna

_int8_max = np.iinfo(np.int8).max
_int16_max = np.iinfo(np.int16).max
Expand Down
30 changes: 15 additions & 15 deletions pandas/core/dtypes/common.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
""" common type operations """
import numpy as np
from pandas.compat import (string_types, text_type, binary_type,
PY3, PY36)

from pandas._libs import algos, lib
from pandas._libs.tslibs import conversion, Period, Timestamp
from pandas._libs.interval import Interval

from pandas._libs.tslibs import Period, Timestamp, conversion
from pandas.compat import PY3, PY36, binary_type, string_types, text_type
from pandas.core.dtypes.dtypes import (
registry, CategoricalDtype, CategoricalDtypeType, DatetimeTZDtype,
PeriodDtype, IntervalDtype,
PandasExtensionDtype, ExtensionDtype,
_pandas_registry)
CategoricalDtype, CategoricalDtypeType, DatetimeTZDtype, ExtensionDtype,
IntervalDtype, PandasExtensionDtype, PeriodDtype, _pandas_registry,
registry
)
from pandas.core.dtypes.generic import (
ABCCategorical, ABCPeriodIndex, ABCDatetimeIndex, ABCSeries,
ABCSparseArray, ABCSparseSeries, ABCCategoricalIndex, ABCIndexClass,
ABCDateOffset)
ABCCategorical, ABCCategoricalIndex, ABCDateOffset, ABCDatetimeIndex,
ABCIndexClass, ABCPeriodIndex, ABCSeries, ABCSparseArray, ABCSparseSeries
)
from pandas.core.dtypes.inference import ( # noqa:F401
is_bool, is_integer, is_float, is_number, is_decimal, is_complex,
is_re, is_re_compilable, is_dict_like, is_string_like, is_file_like,
is_list_like, is_nested_list_like, is_sequence, is_named_tuple,
is_hashable, is_iterator, is_array_like, is_scalar, is_interval)
is_array_like, is_bool, is_complex, is_decimal, is_dict_like, is_file_like,
is_float, is_hashable, is_integer, is_interval, is_iterator, is_list_like,
is_named_tuple, is_nested_list_like, is_number, is_re, is_re_compilable,
is_scalar, is_sequence, is_string_like
)

_POSSIBLY_CAST_DTYPES = {np.dtype(t).name
for t in ['O', 'int8', 'uint8', 'int16', 'uint16',
Expand Down
26 changes: 10 additions & 16 deletions pandas/core/dtypes/concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,19 @@
"""

import numpy as np
from pandas._libs import tslib, tslibs

from pandas import compat
from pandas._libs import tslib, tslibs
from pandas.core.dtypes.common import (
is_categorical_dtype,
is_sparse,
is_extension_array_dtype,
is_datetimetz,
is_datetime64_dtype,
is_timedelta64_dtype,
is_period_dtype,
is_object_dtype,
is_bool_dtype,
is_interval_dtype,
is_dtype_equal,
_NS_DTYPE,
_TD_DTYPE)
_NS_DTYPE, _TD_DTYPE, is_bool_dtype, is_categorical_dtype,
is_datetime64_dtype, is_datetimetz, is_dtype_equal,
is_extension_array_dtype, is_interval_dtype, is_object_dtype,
is_period_dtype, is_sparse, is_timedelta64_dtype
)
from pandas.core.dtypes.generic import (
ABCDatetimeIndex, ABCTimedeltaIndex,
ABCPeriodIndex, ABCRangeIndex, ABCSparseDataFrame)
ABCDatetimeIndex, ABCPeriodIndex, ABCRangeIndex, ABCSparseDataFrame,
ABCTimedeltaIndex
)


def get_dtype_kinds(l):
Expand Down
6 changes: 4 additions & 2 deletions pandas/core/dtypes/dtypes.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
""" define extension dtypes """

import re

import numpy as np

from pandas import compat
from pandas.core.dtypes.generic import ABCIndexClass, ABCCategoricalIndex
from pandas._libs.tslibs import Period, NaT, Timestamp
from pandas._libs.interval import Interval
from pandas._libs.tslibs import NaT, Period, Timestamp
from pandas.core.dtypes.generic import ABCCategoricalIndex, ABCIndexClass

from .base import ExtensionDtype, _DtypeOpsMixin

Expand Down
9 changes: 6 additions & 3 deletions pandas/core/dtypes/inference.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
""" basic inference routines """

import re
import numpy as np
from numbers import Number

import numpy as np

from pandas import compat
from pandas.compat import (PY2, string_types, text_type,
string_and_binary_types, re_type, Set)
from pandas._libs import lib
from pandas.compat import (
PY2, Set, re_type, string_and_binary_types, string_types, text_type
)

is_bool = lib.is_bool

Expand Down
32 changes: 13 additions & 19 deletions pandas/core/dtypes/missing.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,21 @@
missing types & inference
"""
import numpy as np

from pandas._libs import lib, missing as libmissing
from pandas._libs.tslibs import NaT, iNaT
from .generic import (ABCMultiIndex, ABCSeries,
ABCIndexClass, ABCGeneric,
ABCExtensionArray)
from .common import (is_string_dtype, is_datetimelike,
is_datetimelike_v_numeric, is_float_dtype,
is_datetime64_dtype, is_datetime64tz_dtype,
is_timedelta64_dtype,
is_period_dtype,
is_complex_dtype,
is_string_like_dtype, is_bool_dtype,
is_integer_dtype, is_dtype_equal,
is_extension_array_dtype,
needs_i8_conversion, ensure_object,
pandas_dtype,
is_scalar,
is_object_dtype,
is_integer,
_TD_DTYPE,
_NS_DTYPE)

from .common import (
_NS_DTYPE, _TD_DTYPE, ensure_object, is_bool_dtype, is_complex_dtype,
is_datetime64_dtype, is_datetime64tz_dtype, is_datetimelike,
is_datetimelike_v_numeric, is_dtype_equal, is_extension_array_dtype,
is_float_dtype, is_integer, is_integer_dtype, is_object_dtype,
is_period_dtype, is_scalar, is_string_dtype, is_string_like_dtype,
is_timedelta64_dtype, needs_i8_conversion, pandas_dtype
)
from .generic import (
ABCExtensionArray, ABCGeneric, ABCIndexClass, ABCMultiIndex, ABCSeries
)
from .inference import is_list_like

isposinf_scalar = libmissing.isposinf_scalar
Expand Down
8 changes: 0 additions & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,6 @@ skip=
pandas/core/tools/numeric.py,
pandas/core/tools/timedeltas.py,
pandas/core/tools/datetimes.py,
pandas/core/dtypes/concat.py,
pandas/core/dtypes/cast.py,
pandas/core/dtypes/api.py,
pandas/core/dtypes/dtypes.py,
pandas/core/dtypes/base.py,
pandas/core/dtypes/common.py,
pandas/core/dtypes/missing.py,
pandas/core/dtypes/inference.py,
pandas/core/internals/concat.py,
pandas/core/internals/managers.py,
pandas/core/internals/blocks.py,
Expand Down

0 comments on commit 1ee7d42

Please sign in to comment.