diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index e55a4fbdf3fa9..6643f804eb6f7 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -22,7 +22,6 @@ dependencies: - hypothesis>=3.58.0 - pytest-xdist - pytest-mock - - isort - pip - pip: # for python 3.5, pytest>=4.0.2 is not available in conda diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index f43ed0249985e..320839756befb 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -24,7 +24,6 @@ dependencies: - pytest-xdist - pytest-mock - hypothesis>=3.58.0 - - isort - pip - pip: - html5lib==1.0b2 diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 2a0404614dcfc..9ddc782da930e 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -30,7 +30,6 @@ dependencies: - pytest-xdist - pytest-mock - moto - - isort - pip - pip: - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 649f5892f174d..2ebb7dda86e36 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -28,7 +28,6 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock - - isort - pip - pip: - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index 6848b9990b46e..831f13fb421f0 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -10,7 +10,6 @@ dependencies: - pytest-xdist - pytest-mock - hypothesis>=3.58.0 - - isort - pip - pip: - "git+git://github.com/dateutil/dateutil.git" diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 00c2051f29760..30290277fd644 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -21,7 +21,6 @@ dependencies: - xlrd - xlsxwriter - xlwt - - isort - pip: - python-dateutil==2.5.3 # universal diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index 7b3ae259fb8dd..b1795059091b9 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -27,4 +27,3 @@ dependencies: - pytest-xdist - pytest-mock - hypothesis>=3.58.0 - - isort diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 5384e794d442a..04e4f74f85e4d 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -30,4 +30,3 @@ dependencies: - pytest-mock - moto - hypothesis>=3.58.0 - - isort diff --git a/pandas/_libs/__init__.py b/pandas/_libs/__init__.py index 1f6042389416e..fcf5ffbfcad92 100644 --- a/pandas/_libs/__init__.py +++ b/pandas/_libs/__init__.py @@ -1,4 +1,4 @@ # flake8: noqa from .tslibs import ( - iNaT, NaT, NaTType, Timestamp, Timedelta, OutOfBoundsDatetime, Period) + NaT, NaTType, OutOfBoundsDatetime, Period, Timedelta, Timestamp, iNaT) diff --git a/pandas/_libs/tslibs/__init__.py b/pandas/_libs/tslibs/__init__.py index 21ba0ae06a036..67a323782a836 100644 --- a/pandas/_libs/tslibs/__init__.py +++ b/pandas/_libs/tslibs/__init__.py @@ -1,9 +1,9 @@ # flake8: noqa -from .conversion import normalize_date, localize_pydatetime +from .conversion import localize_pydatetime, normalize_date from .nattype import NaT, NaTType, iNaT, is_null_datetimelike from .np_datetime import OutOfBoundsDatetime -from .period import Period, IncompatibleFrequency +from .period import IncompatibleFrequency, Period +from .timedeltas import Timedelta, delta_to_nanoseconds, ints_to_pytimedelta from .timestamps import Timestamp -from .timedeltas import delta_to_nanoseconds, ints_to_pytimedelta, Timedelta from .tzconversion import tz_convert_single diff --git a/pandas/api/__init__.py b/pandas/api/__init__.py index afff059e7b601..58422811990c4 100644 --- a/pandas/api/__init__.py +++ b/pandas/api/__init__.py @@ -1,2 +1,2 @@ """ public toolkit API """ -from . import types, extensions # noqa +from . import extensions, types # noqa diff --git a/pandas/api/extensions/__init__.py b/pandas/api/extensions/__init__.py index cb6241016d82f..36d875d2e7b84 100644 --- a/pandas/api/extensions/__init__.py +++ b/pandas/api/extensions/__init__.py @@ -1,10 +1,10 @@ """Public API for extending pandas objects.""" -from pandas.core.accessor import (register_dataframe_accessor, # noqa - register_index_accessor, - register_series_accessor) -from pandas.core.algorithms import take # noqa -from pandas.core.arrays import (ExtensionArray, # noqa - ExtensionScalarOpsMixin) from pandas.core.dtypes.dtypes import ( # noqa - ExtensionDtype, register_extension_dtype -) + ExtensionDtype, register_extension_dtype) + +from pandas.core.accessor import ( + register_index_accessor, register_series_accessor) +from pandas.core.accessor import register_dataframe_accessor # noqa +from pandas.core.algorithms import take # noqa +from pandas.core.arrays import ExtensionArray # noqa +from pandas.core.arrays import ExtensionScalarOpsMixin diff --git a/pandas/api/types/__init__.py b/pandas/api/types/__init__.py index 438e4afa3f580..e2144336a8c06 100644 --- a/pandas/api/types/__init__.py +++ b/pandas/api/types/__init__.py @@ -1,9 +1,9 @@ """ public toolkit API """ +from pandas._libs.lib import infer_dtype # noqa + from pandas.core.dtypes.api import * # noqa -from pandas.core.dtypes.dtypes import (CategoricalDtype, # noqa - DatetimeTZDtype, - PeriodDtype, - IntervalDtype) from pandas.core.dtypes.concat import union_categoricals # noqa -from pandas._libs.lib import infer_dtype # noqa +from pandas.core.dtypes.dtypes import ( + DatetimeTZDtype, IntervalDtype, PeriodDtype) +from pandas.core.dtypes.dtypes import CategoricalDtype # noqa diff --git a/pandas/arrays/__init__.py b/pandas/arrays/__init__.py index 7d9b1b7c7a659..ab014d49236b3 100644 --- a/pandas/arrays/__init__.py +++ b/pandas/arrays/__init__.py @@ -4,12 +4,8 @@ See :ref:`extending.extension-types` for more. """ from pandas.core.arrays import ( - IntervalArray, PeriodArray, Categorical, SparseArray, IntegerArray, - PandasArray, - DatetimeArray, - TimedeltaArray, -) - + Categorical, DatetimeArray, IntegerArray, IntervalArray, PandasArray, + PeriodArray, SparseArray, TimedeltaArray) __all__ = [ 'Categorical', diff --git a/pandas/compat/numpy/__init__.py b/pandas/compat/numpy/__init__.py index 3499d631376d8..0b259d3b2be76 100644 --- a/pandas/compat/numpy/__init__.py +++ b/pandas/compat/numpy/__init__.py @@ -1,9 +1,9 @@ """ support numpy compatiblitiy across versions """ -import re -import numpy as np from distutils.version import LooseVersion +import re +import numpy as np # numpy versioning _np_version = np.__version__ diff --git a/pandas/core/arrays/__init__.py b/pandas/core/arrays/__init__.py index 1033ce784046e..e21589e2a11ff 100644 --- a/pandas/core/arrays/__init__.py +++ b/pandas/core/arrays/__init__.py @@ -1,13 +1,11 @@ from .array_ import array # noqa -from .base import (ExtensionArray, # noqa - ExtensionOpsMixin, - ExtensionScalarOpsMixin) +from .base import ExtensionArray # noqa +from .base import ExtensionOpsMixin, ExtensionScalarOpsMixin from .categorical import Categorical # noqa from .datetimes import DatetimeArray # noqa +from .integer import IntegerArray, integer_array # noqa from .interval import IntervalArray # noqa +from .numpy_ import PandasArray, PandasDtype # noqa from .period import PeriodArray, period_array # noqa -from .timedeltas import TimedeltaArray # noqa -from .integer import ( # noqa - IntegerArray, integer_array) from .sparse import SparseArray # noqa -from .numpy_ import PandasArray, PandasDtype # noqa +from .timedeltas import TimedeltaArray # noqa diff --git a/pandas/core/internals/__init__.py b/pandas/core/internals/__init__.py index d24dd2edd4e1d..3e2d310458ab3 100644 --- a/pandas/core/internals/__init__.py +++ b/pandas/core/internals/__init__.py @@ -1,12 +1,14 @@ -from .blocks import ( # noqa:F401 - _block_shape, # io.pytables - _safe_reshape, # io.packers - make_block, # io.pytables, io.packers - FloatBlock, IntBlock, ComplexBlock, BoolBlock, ObjectBlock, - TimeDeltaBlock, DatetimeBlock, DatetimeTZBlock, - CategoricalBlock, ExtensionBlock, Block) -from .managers import ( # noqa:F401 - BlockManager, SingleBlockManager, - create_block_manager_from_arrays, create_block_manager_from_blocks, - items_overlap_with_suffix, # reshape.merge - concatenate_block_managers) # reshape.concat, reshape.merge +from .blocks import ( + Block, BoolBlock, CategoricalBlock, ComplexBlock, DatetimeBlock, + DatetimeTZBlock, ExtensionBlock, FloatBlock, IntBlock, ObjectBlock, + TimeDeltaBlock) +from .blocks import _safe_reshape # io.packers +from .blocks import make_block # io.pytables, io.packers +from .managers import ( + BlockManager, SingleBlockManager, create_block_manager_from_arrays, + create_block_manager_from_blocks) +from .managers import \ + concatenate_block_managers # noqa:F401; reshape.concat, reshape.merge +from .managers import items_overlap_with_suffix # reshape.merge + +from .blocks import _block_shape # noqa:F401; io.pytables diff --git a/pandas/io/clipboard/__init__.py b/pandas/io/clipboard/__init__.py index 2063978c76c5a..e033d882a73f7 100644 --- a/pandas/io/clipboard/__init__.py +++ b/pandas/io/clipboard/__init__.py @@ -25,12 +25,13 @@ """ __version__ = '1.5.27' -import platform import os +import platform import subprocess + from .clipboards import ( - init_osx_clipboard, init_qt_clipboard, init_xclip_clipboard, - init_xsel_clipboard, init_klipper_clipboard, init_no_clipboard) + init_klipper_clipboard, init_no_clipboard, init_osx_clipboard, + init_qt_clipboard, init_xclip_clipboard, init_xsel_clipboard) from .windows import init_windows_clipboard # `import qtpy` sys.exit()s if DISPLAY is not in the environment. diff --git a/pandas/io/excel/__init__.py b/pandas/io/excel/__init__.py index 704789cb6061e..455abaa7fb589 100644 --- a/pandas/io/excel/__init__.py +++ b/pandas/io/excel/__init__.py @@ -1,4 +1,4 @@ -from pandas.io.excel._base import read_excel, ExcelWriter, ExcelFile +from pandas.io.excel._base import ExcelFile, ExcelWriter, read_excel from pandas.io.excel._openpyxl import _OpenpyxlWriter from pandas.io.excel._util import register_writer from pandas.io.excel._xlsxwriter import _XlsxWriter diff --git a/pandas/io/json/__init__.py b/pandas/io/json/__init__.py index 32d110b3404a9..cbb4e37fae6a1 100644 --- a/pandas/io/json/__init__.py +++ b/pandas/io/json/__init__.py @@ -1,4 +1,4 @@ -from .json import to_json, read_json, loads, dumps # noqa +from .json import dumps, loads, read_json, to_json # noqa from .normalize import json_normalize # noqa from .table_schema import build_table_schema # noqa diff --git a/pandas/plotting/__init__.py b/pandas/plotting/__init__.py index ff5351bb6c6ea..24b3f40d6e9f8 100644 --- a/pandas/plotting/__init__.py +++ b/pandas/plotting/__init__.py @@ -4,13 +4,13 @@ # flake8: noqa -from pandas.plotting._misc import (scatter_matrix, radviz, - andrews_curves, bootstrap_plot, - parallel_coordinates, lag_plot, - autocorrelation_plot) from pandas.plotting._core import boxplot +from pandas.plotting._misc import ( + andrews_curves, autocorrelation_plot, bootstrap_plot, lag_plot, + parallel_coordinates, radviz, scatter_matrix) from pandas.plotting._style import plot_params from pandas.plotting._tools import table + try: from pandas.plotting._converter import ( register as register_matplotlib_converters) diff --git a/pandas/tests/extension/base/__init__.py b/pandas/tests/extension/base/__init__.py index 1f7ee2ae17e4a..0b3f2b860c127 100644 --- a/pandas/tests/extension/base/__init__.py +++ b/pandas/tests/extension/base/__init__.py @@ -46,11 +46,13 @@ class TestMyDtype(BaseDtypeTests): from .getitem import BaseGetitemTests # noqa from .groupby import BaseGroupbyTests # noqa from .interface import BaseInterfaceTests # noqa +from .io import BaseParsingTests # noqa from .methods import BaseMethodsTests # noqa -from .ops import BaseArithmeticOpsTests, BaseComparisonOpsTests, BaseOpsUtil # noqa -from .printing import BasePrintingTests # noqa -from .reduce import BaseNoReduceTests, BaseNumericReduceTests, BaseBooleanReduceTests # noqa from .missing import BaseMissingTests # noqa +from .ops import ( # noqa + BaseArithmeticOpsTests, BaseComparisonOpsTests, BaseOpsUtil) +from .printing import BasePrintingTests # noqa +from .reduce import ( # noqa + BaseBooleanReduceTests, BaseNoReduceTests, BaseNumericReduceTests) from .reshaping import BaseReshapingTests # noqa from .setitem import BaseSetitemTests # noqa -from .io import BaseParsingTests # noqa diff --git a/pandas/tests/extension/decimal/__init__.py b/pandas/tests/extension/decimal/__init__.py index c37aad0af8407..7c48e7e71503e 100644 --- a/pandas/tests/extension/decimal/__init__.py +++ b/pandas/tests/extension/decimal/__init__.py @@ -1,4 +1,3 @@ -from .array import DecimalArray, DecimalDtype, to_decimal, make_data - +from .array import DecimalArray, DecimalDtype, make_data, to_decimal __all__ = ['DecimalArray', 'DecimalDtype', 'to_decimal', 'make_data'] diff --git a/pandas/util/__init__.py b/pandas/util/__init__.py index 202e58c916e47..9600109f01534 100644 --- a/pandas/util/__init__.py +++ b/pandas/util/__init__.py @@ -1,2 +1,4 @@ -from pandas.util._decorators import Appender, Substitution, cache_readonly # noqa -from pandas.core.util.hashing import hash_pandas_object, hash_array # noqa +from pandas.util._decorators import ( # noqa + Appender, Substitution, cache_readonly) + +from pandas.core.util.hashing import hash_array, hash_pandas_object # noqa diff --git a/setup.cfg b/setup.cfg index 68d042ecfc4b8..ef1cec44bdecd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -159,22 +159,4 @@ skip= asv_bench/benchmarks/strings.py asv_bench/benchmarks/period.py pandas/__init__.py - pandas/plotting/__init__.py - pandas/tests/extension/decimal/__init__.py - pandas/tests/extension/base/__init__.py - pandas/io/msgpack/__init__.py - pandas/io/json/__init__.py - pandas/io/clipboard/__init__.py - pandas/io/excel/__init__.py - pandas/compat/__init__.py - pandas/compat/numpy/__init__.py - pandas/core/arrays/__init__.py - pandas/core/groupby/__init__.py - pandas/core/internals/__init__.py - pandas/api/__init__.py - pandas/api/extensions/__init__.py - pandas/api/types/__init__.py - pandas/_libs/__init__.py - pandas/_libs/tslibs/__init__.py - pandas/util/__init__.py - pandas/arrays/__init__.py + pandas/io/msgpack/__init__.py \ No newline at end of file