Skip to content

WIP: isort init files #26671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci/deps/azure-35-compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ci/deps/azure-36-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ dependencies:
- pytest-xdist
- pytest-mock
- hypothesis>=3.58.0
- isort
- pip
- pip:
- html5lib==1.0b2
1 change: 0 additions & 1 deletion ci/deps/azure-36-locale_slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ dependencies:
- pytest-xdist
- pytest-mock
- moto
- isort
- pip
- pip:
- hypothesis>=3.58.0
1 change: 0 additions & 1 deletion ci/deps/azure-37-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dependencies:
- pytest>=4.0.2
- pytest-xdist
- pytest-mock
- isort
- pip
- pip:
- hypothesis>=3.58.0
Expand Down
1 change: 0 additions & 1 deletion ci/deps/azure-37-numpydev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- pytest-xdist
- pytest-mock
- hypothesis>=3.58.0
- isort
- pip
- pip:
- "git+git://github.com/dateutil/dateutil.git"
Expand Down
1 change: 0 additions & 1 deletion ci/deps/azure-macos-35.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ dependencies:
- xlrd
- xlsxwriter
- xlwt
- isort
- pip:
- python-dateutil==2.5.3
# universal
Expand Down
1 change: 0 additions & 1 deletion ci/deps/azure-windows-36.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ dependencies:
- pytest-xdist
- pytest-mock
- hypothesis>=3.58.0
- isort
1 change: 0 additions & 1 deletion ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ dependencies:
- pytest-mock
- moto
- hypothesis>=3.58.0
- isort
2 changes: 1 addition & 1 deletion pandas/_libs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# flake8: noqa

from .tslibs import (
iNaT, NaT, NaTType, Timestamp, Timedelta, OutOfBoundsDatetime, Period)
NaT, NaTType, OutOfBoundsDatetime, Period, Timedelta, Timestamp, iNaT)
6 changes: 3 additions & 3 deletions pandas/_libs/tslibs/__init__.py
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion pandas/api/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
""" public toolkit API """
from . import types, extensions # noqa
from . import extensions, types # noqa
16 changes: 8 additions & 8 deletions pandas/api/extensions/__init__.py
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions pandas/api/types/__init__.py
Original file line number Diff line number Diff line change
@@ -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
8 changes: 2 additions & 6 deletions pandas/arrays/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions pandas/compat/numpy/__init__.py
Original file line number Diff line number Diff line change
@@ -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__
Expand Down
12 changes: 5 additions & 7 deletions pandas/core/arrays/__init__.py
Original file line number Diff line number Diff line change
@@ -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
26 changes: 14 additions & 12 deletions pandas/core/internals/__init__.py
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions pandas/io/clipboard/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/excel/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/json/__init__.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions pandas/plotting/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 6 additions & 4 deletions pandas/tests/extension/base/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions pandas/tests/extension/decimal/__init__.py
Original file line number Diff line number Diff line change
@@ -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']
6 changes: 4 additions & 2 deletions pandas/util/__init__.py
Original file line number Diff line number Diff line change
@@ -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
20 changes: 1 addition & 19 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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