From 8394db15ce6f8cbeed692b79e691c710b08945d3 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Fri, 26 Oct 2018 04:57:05 +0100 Subject: [PATCH 1/4] isort util dir --- pandas/_version.py | 1 + pandas/conftest.py | 14 ++++---- pandas/testing.py | 3 +- pandas/util/_decorators.py | 7 ++-- pandas/util/_depr_module.py | 2 +- pandas/util/_doctools.py | 1 + pandas/util/_print_versions.py | 8 ++--- pandas/util/_test_decorators.py | 13 ++++--- pandas/util/testing.py | 63 ++++++++++++++------------------- setup.cfg | 13 ------- 10 files changed, 53 insertions(+), 72 deletions(-) diff --git a/pandas/_version.py b/pandas/_version.py index f4c8938c683da..036c927df45d3 100644 --- a/pandas/_version.py +++ b/pandas/_version.py @@ -12,6 +12,7 @@ import re import subprocess import sys + from pandas.compat import PY3 diff --git a/pandas/conftest.py b/pandas/conftest.py index b8ba347651ae6..9f5afd45b748b 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -1,15 +1,14 @@ -import os import importlib +import os +import hypothesis +import numpy as np import pytest +from hypothesis import strategies as st -import pandas -import numpy as np import pandas as pd -from pandas.compat import PY3 import pandas.util._test_decorators as td -import hypothesis - +from pandas.compat import PY3 hypothesis.settings.register_profile( "ci", @@ -285,7 +284,7 @@ def deco(*args): @pytest.fixture def iris(datapath): """The iris dataset as a DataFrame.""" - return pandas.read_csv(datapath('data', 'iris.csv')) + return pd.read_csv(datapath('data', 'iris.csv')) @pytest.fixture(params=['nlargest', 'nsmallest']) @@ -512,7 +511,6 @@ def mock(): # ---------------------------------------------------------------- # Global setup for tests using Hypothesis -from hypothesis import strategies as st # Registering these strategies makes them globally available via st.from_type, # which is use for offsets in tests/tseries/offsets/test_offsets_properties.py diff --git a/pandas/testing.py b/pandas/testing.py index 3baf99957cb33..0fff661d2622c 100644 --- a/pandas/testing.py +++ b/pandas/testing.py @@ -5,4 +5,5 @@ """ from pandas.util.testing import ( - assert_frame_equal, assert_series_equal, assert_index_equal) + assert_frame_equal, assert_index_equal, assert_series_equal +) diff --git a/pandas/util/_decorators.py b/pandas/util/_decorators.py index 82cd44113cb25..8003a65ebcb28 100644 --- a/pandas/util/_decorators.py +++ b/pandas/util/_decorators.py @@ -1,9 +1,10 @@ -from pandas.compat import callable, signature, PY2 -from pandas._libs.properties import cache_readonly # noqa import inspect import warnings +from functools import WRAPPER_ASSIGNMENTS, update_wrapper, wraps from textwrap import dedent, wrap -from functools import wraps, update_wrapper, WRAPPER_ASSIGNMENTS + +from pandas._libs.properties import cache_readonly # noqa +from pandas.compat import PY2, callable, signature def deprecate(name, alternative, version, alt_name=None, diff --git a/pandas/util/_depr_module.py b/pandas/util/_depr_module.py index 9c648b76fdad1..2c8feec798c66 100644 --- a/pandas/util/_depr_module.py +++ b/pandas/util/_depr_module.py @@ -3,8 +3,8 @@ It is for internal use only and should not be used beyond this purpose. """ -import warnings import importlib +import warnings class _DeprecatedModule(object): diff --git a/pandas/util/_doctools.py b/pandas/util/_doctools.py index c9e6e27363aed..868d3cd9769f9 100644 --- a/pandas/util/_doctools.py +++ b/pandas/util/_doctools.py @@ -1,4 +1,5 @@ import numpy as np + import pandas as pd import pandas.compat as compat diff --git a/pandas/util/_print_versions.py b/pandas/util/_print_versions.py index 03fc82a3acef5..3016bf04b5258 100644 --- a/pandas/util/_print_versions.py +++ b/pandas/util/_print_versions.py @@ -1,11 +1,11 @@ +import codecs +import importlib +import locale import os import platform -import sys import struct import subprocess -import codecs -import locale -import importlib +import sys def get_sys_info(): diff --git a/pandas/util/_test_decorators.py b/pandas/util/_test_decorators.py index 2fe891346065d..f6a4d8db8cf1d 100644 --- a/pandas/util/_test_decorators.py +++ b/pandas/util/_test_decorators.py @@ -23,15 +23,18 @@ def test_foo(): For more information, refer to the ``pytest`` documentation on ``skipif``. """ -import pytest import locale from distutils.version import LooseVersion -from pandas.compat import (is_platform_windows, is_platform_32bit, PY3, - import_lzma) +import pytest + +from pandas.compat import ( + PY3, import_lzma, is_platform_32bit, is_platform_windows +) from pandas.compat.numpy import _np_version_under1p15 -from pandas.core.computation.expressions import (_USE_NUMEXPR, - _NUMEXPR_INSTALLED) +from pandas.core.computation.expressions import ( + _NUMEXPR_INSTALLED, _USE_NUMEXPR +) def safe_import(mod_name, min_version=None): diff --git a/pandas/util/testing.py b/pandas/util/testing.py index 8871cac6f6af6..86989fba74a22 100644 --- a/pandas/util/testing.py +++ b/pandas/util/testing.py @@ -1,57 +1,46 @@ from __future__ import division -# pylint: disable-msg=W0402 +import locale +import os import re import string +import subprocess import sys import tempfile -import warnings -import os -import subprocess -import locale import traceback - +import warnings +from contextlib import contextmanager from datetime import datetime from functools import wraps -from contextlib import contextmanager -from numpy.random import randn, rand import numpy as np +from numpy.random import rand, randn import pandas as pd -from pandas.core.arrays import ( - ExtensionArray, - IntervalArray, - PeriodArray, -) -from pandas.core.dtypes.missing import array_equivalent -from pandas.core.dtypes.common import ( - is_datetimelike_v_numeric, - is_datetimelike_v_object, - is_number, is_bool, - needs_i8_conversion, - is_categorical_dtype, - is_interval_dtype, - is_sequence, - is_list_like, - is_extension_array_dtype) -from pandas.io.formats.printing import pprint_thing -from pandas.core.algorithms import take_1d -import pandas.core.common as com - import pandas.compat as compat -from pandas.compat import ( - filter, map, zip, range, unichr, lrange, lmap, lzip, u, callable, Counter, - raise_with_traceback, httplib, StringIO, string_types, PY3, PY2) - -from pandas import (bdate_range, CategoricalIndex, Categorical, IntervalIndex, - DatetimeIndex, TimedeltaIndex, PeriodIndex, RangeIndex, - Index, MultiIndex, - Series, DataFrame, Panel) - +import pandas.core.common as com +from pandas import ( + Categorical, CategoricalIndex, DataFrame, DatetimeIndex, Index, + IntervalIndex, MultiIndex, Panel, PeriodIndex, RangeIndex, Series, + TimedeltaIndex, bdate_range +) from pandas._libs import testing as _testing +from pandas.compat import ( + PY2, PY3, Counter, StringIO, callable, filter, httplib, lmap, lrange, lzip, + map, raise_with_traceback, range, string_types, u, unichr, zip +) +from pandas.core.algorithms import take_1d +from pandas.core.arrays import ExtensionArray, IntervalArray, PeriodArray +from pandas.core.dtypes.common import ( + is_bool, is_categorical_dtype, is_datetimelike_v_numeric, + is_datetimelike_v_object, is_extension_array_dtype, is_interval_dtype, + is_list_like, is_number, is_sequence, needs_i8_conversion +) +from pandas.core.dtypes.missing import array_equivalent from pandas.io.common import urlopen +from pandas.io.formats.printing import pprint_thing +# pylint: disable-msg=W0402 N = 30 K = 4 diff --git a/setup.cfg b/setup.cfg index e1d0dc84f464a..7592e293b2be6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -83,19 +83,6 @@ multi_line_output=5 force_grid_wrap=0 combine_as_imports=True skip= - pandas/lib.py, - pandas/tslib.py, - pandas/testing.py, - pandas/conftest.py, - pandas/_version.py, - pandas/parser.py, - pandas/util/_depr_module.py, - pandas/util/testing.py, - pandas/util/_doctools.py, - pandas/util/decorators.py, - pandas/util/_print_versions.py, - pandas/util/_decorators.py, - pandas/util/_test_decorators.py, pandas/io/sas/sas7bdat.py, pandas/io/formats/console.py, pandas/io/formats/excel.py, From 866d30ca5960a867f1f5de8b9ec2ffd20c1cf415 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Sun, 28 Oct 2018 18:00:13 +0000 Subject: [PATCH 2/4] Remove pylint ignore warning --- pandas/util/testing.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/util/testing.py b/pandas/util/testing.py index 86989fba74a22..29449770091b9 100644 --- a/pandas/util/testing.py +++ b/pandas/util/testing.py @@ -40,7 +40,6 @@ from pandas.io.common import urlopen from pandas.io.formats.printing import pprint_thing -# pylint: disable-msg=W0402 N = 30 K = 4 From 23a746ebc4333e2dde26201ae9e1546b16d0117f Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Sun, 28 Oct 2018 20:11:57 +0000 Subject: [PATCH 3/4] Fix newline isort --- pandas/util/testing.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/util/testing.py b/pandas/util/testing.py index 29449770091b9..23639c9ba00bf 100644 --- a/pandas/util/testing.py +++ b/pandas/util/testing.py @@ -40,7 +40,6 @@ from pandas.io.common import urlopen from pandas.io.formats.printing import pprint_thing - N = 30 K = 4 _RAISE_NETWORK_ERROR_DEFAULT = False From 7baa169f805ba2e2d6d5803bbb369ea0402128ae Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Mon, 29 Oct 2018 20:51:49 +0000 Subject: [PATCH 4/4] New isort - fix imports --- pandas/conftest.py | 7 ++++--- pandas/testing.py | 3 +-- pandas/util/_decorators.py | 4 ++-- pandas/util/_doctools.py | 3 ++- pandas/util/_test_decorators.py | 9 ++++----- pandas/util/testing.py | 34 ++++++++++++++++----------------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index 9f5afd45b748b..6142f188f5613 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -2,13 +2,14 @@ import os import hypothesis +from hypothesis import strategies as st import numpy as np import pytest -from hypothesis import strategies as st -import pandas as pd -import pandas.util._test_decorators as td from pandas.compat import PY3 +import pandas.util._test_decorators as td + +import pandas as pd hypothesis.settings.register_profile( "ci", diff --git a/pandas/testing.py b/pandas/testing.py index 0fff661d2622c..dbea1ecc7362a 100644 --- a/pandas/testing.py +++ b/pandas/testing.py @@ -5,5 +5,4 @@ """ from pandas.util.testing import ( - assert_frame_equal, assert_index_equal, assert_series_equal -) + assert_frame_equal, assert_index_equal, assert_series_equal) diff --git a/pandas/util/_decorators.py b/pandas/util/_decorators.py index 8003a65ebcb28..638282f322c74 100644 --- a/pandas/util/_decorators.py +++ b/pandas/util/_decorators.py @@ -1,7 +1,7 @@ -import inspect -import warnings from functools import WRAPPER_ASSIGNMENTS, update_wrapper, wraps +import inspect from textwrap import dedent, wrap +import warnings from pandas._libs.properties import cache_readonly # noqa from pandas.compat import PY2, callable, signature diff --git a/pandas/util/_doctools.py b/pandas/util/_doctools.py index 868d3cd9769f9..4aee0a2e5350e 100644 --- a/pandas/util/_doctools.py +++ b/pandas/util/_doctools.py @@ -1,8 +1,9 @@ import numpy as np -import pandas as pd import pandas.compat as compat +import pandas as pd + class TablePlotter(object): """ diff --git a/pandas/util/_test_decorators.py b/pandas/util/_test_decorators.py index f6a4d8db8cf1d..52a6740f119b7 100644 --- a/pandas/util/_test_decorators.py +++ b/pandas/util/_test_decorators.py @@ -23,18 +23,17 @@ def test_foo(): For more information, refer to the ``pytest`` documentation on ``skipif``. """ -import locale from distutils.version import LooseVersion +import locale import pytest from pandas.compat import ( - PY3, import_lzma, is_platform_32bit, is_platform_windows -) + PY3, import_lzma, is_platform_32bit, is_platform_windows) from pandas.compat.numpy import _np_version_under1p15 + from pandas.core.computation.expressions import ( - _NUMEXPR_INSTALLED, _USE_NUMEXPR -) + _NUMEXPR_INSTALLED, _USE_NUMEXPR) def safe_import(mod_name, min_version=None): diff --git a/pandas/util/testing.py b/pandas/util/testing.py index 23639c9ba00bf..96387349eecd7 100644 --- a/pandas/util/testing.py +++ b/pandas/util/testing.py @@ -1,5 +1,8 @@ from __future__ import division +from contextlib import contextmanager +from datetime import datetime +from functools import wraps import locale import os import re @@ -9,34 +12,31 @@ import tempfile import traceback import warnings -from contextlib import contextmanager -from datetime import datetime -from functools import wraps import numpy as np from numpy.random import rand, randn -import pandas as pd -import pandas.compat as compat -import pandas.core.common as com -from pandas import ( - Categorical, CategoricalIndex, DataFrame, DatetimeIndex, Index, - IntervalIndex, MultiIndex, Panel, PeriodIndex, RangeIndex, Series, - TimedeltaIndex, bdate_range -) from pandas._libs import testing as _testing +import pandas.compat as compat from pandas.compat import ( PY2, PY3, Counter, StringIO, callable, filter, httplib, lmap, lrange, lzip, - map, raise_with_traceback, range, string_types, u, unichr, zip -) -from pandas.core.algorithms import take_1d -from pandas.core.arrays import ExtensionArray, IntervalArray, PeriodArray + map, raise_with_traceback, range, string_types, u, unichr, zip) + from pandas.core.dtypes.common import ( is_bool, is_categorical_dtype, is_datetimelike_v_numeric, is_datetimelike_v_object, is_extension_array_dtype, is_interval_dtype, - is_list_like, is_number, is_sequence, needs_i8_conversion -) + is_list_like, is_number, is_sequence, needs_i8_conversion) from pandas.core.dtypes.missing import array_equivalent + +import pandas as pd +from pandas import ( + Categorical, CategoricalIndex, DataFrame, DatetimeIndex, Index, + IntervalIndex, MultiIndex, Panel, PeriodIndex, RangeIndex, Series, + TimedeltaIndex, bdate_range) +from pandas.core.algorithms import take_1d +from pandas.core.arrays import ExtensionArray, IntervalArray, PeriodArray +import pandas.core.common as com + from pandas.io.common import urlopen from pandas.io.formats.printing import pprint_thing