From 3249e537053560a0a27e371b7ea51442554b5708 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Sat, 12 Jan 2019 20:46:30 +0000 Subject: [PATCH 1/4] More isort --- pandas/tests/computation/test_compat.py | 6 ++-- pandas/tests/computation/test_eval.py | 41 ++++++++++------------- pandas/tests/extension/arrow/test_bool.py | 5 +-- pandas/tests/extension/test_sparse.py | 5 +-- pandas/tests/internals/test_internals.py | 37 ++++++++++---------- pandas/tests/tools/test_numeric.py | 6 ++-- setup.cfg | 10 ------ 7 files changed, 47 insertions(+), 63 deletions(-) diff --git a/pandas/tests/computation/test_compat.py b/pandas/tests/computation/test_compat.py index c25ef4bf38cab..7cc373d06cfe1 100644 --- a/pandas/tests/computation/test_compat.py +++ b/pandas/tests/computation/test_compat.py @@ -1,11 +1,11 @@ -import pytest from distutils.version import LooseVersion -import pandas as pd +import pytest +import pandas as pd +from pandas.core.computation.check import _MIN_NUMEXPR_VERSION from pandas.core.computation.engines import _engines import pandas.core.computation.expr as expr -from pandas.core.computation.check import _MIN_NUMEXPR_VERSION def test_compat(): diff --git a/pandas/tests/computation/test_eval.py b/pandas/tests/computation/test_eval.py index 1649c99384ef2..c1ba15f428eb7 100644 --- a/pandas/tests/computation/test_eval.py +++ b/pandas/tests/computation/test_eval.py @@ -1,39 +1,34 @@ -import warnings -import operator from distutils.version import LooseVersion from itertools import product +import operator +import warnings +import numpy as np +from numpy.random import rand, randint, randn import pytest -from numpy.random import randn, rand, randint -import numpy as np +from pandas.compat import PY3, reduce +from pandas.errors import PerformanceWarning +import pandas.util._test_decorators as td from pandas.core.dtypes.common import is_bool, is_list_like, is_scalar -import pandas as pd -from pandas.errors import PerformanceWarning -from pandas import DataFrame, Series, Panel, date_range -from pandas.util.testing import makeCustomDataframe as mkdf +import pandas as pd +from pandas import DataFrame, Panel, Series, date_range from pandas.core.computation import pytables from pandas.core.computation.check import _NUMEXPR_VERSION -from pandas.core.computation.engines import _engines, NumExprClobberingError -from pandas.core.computation.expr import PythonExprVisitor, PandasExprVisitor +from pandas.core.computation.engines import NumExprClobberingError, _engines +import pandas.core.computation.expr as expr +from pandas.core.computation.expr import PandasExprVisitor, PythonExprVisitor from pandas.core.computation.expressions import ( - _USE_NUMEXPR, _NUMEXPR_INSTALLED) + _NUMEXPR_INSTALLED, _USE_NUMEXPR) from pandas.core.computation.ops import ( - _binary_ops_dict, - _special_case_arith_ops_syms, - _arith_ops_syms, _bool_ops_syms, - _unary_math_ops, _binary_math_ops) - -import pandas.core.computation.expr as expr + _arith_ops_syms, _binary_math_ops, _binary_ops_dict, _bool_ops_syms, + _special_case_arith_ops_syms, _unary_math_ops) import pandas.util.testing as tm -import pandas.util._test_decorators as td -from pandas.util.testing import (assert_frame_equal, randbool, - assert_numpy_array_equal, assert_series_equal, - assert_produces_warning) -from pandas.compat import PY3, reduce - +from pandas.util.testing import ( + assert_frame_equal, assert_numpy_array_equal, assert_produces_warning, + assert_series_equal, makeCustomDataframe as mkdf, randbool) _series_frame_incompatible = _bool_ops_syms _scalar_skip = 'in', 'not in' diff --git a/pandas/tests/extension/arrow/test_bool.py b/pandas/tests/extension/arrow/test_bool.py index 2ace0fadc73e9..0e9f56698508d 100644 --- a/pandas/tests/extension/arrow/test_bool.py +++ b/pandas/tests/extension/arrow/test_bool.py @@ -2,12 +2,13 @@ import pytest import pandas as pd -import pandas.util.testing as tm from pandas.tests.extension import base +import pandas.util.testing as tm + +from .bool import ArrowBoolArray, ArrowBoolDtype pytest.importorskip('pyarrow', minversion="0.10.0") -from .bool import ArrowBoolArray, ArrowBoolDtype @pytest.fixture diff --git a/pandas/tests/extension/test_sparse.py b/pandas/tests/extension/test_sparse.py index 39a138ed534bd..21dbf9524961c 100644 --- a/pandas/tests/extension/test_sparse.py +++ b/pandas/tests/extension/test_sparse.py @@ -1,11 +1,12 @@ import numpy as np import pytest +from pandas.errors import PerformanceWarning + import pandas as pd -import pandas.util.testing as tm from pandas import SparseArray, SparseDtype -from pandas.errors import PerformanceWarning from pandas.tests.extension import base +import pandas.util.testing as tm def make_data(fill_value): diff --git a/pandas/tests/internals/test_internals.py b/pandas/tests/internals/test_internals.py index 7147761d23caa..fe0706efdc4f8 100644 --- a/pandas/tests/internals/test_internals.py +++ b/pandas/tests/internals/test_internals.py @@ -1,32 +1,29 @@ # -*- coding: utf-8 -*- # pylint: disable=W0102 -from datetime import datetime, date +from datetime import date, datetime +from distutils.version import LooseVersion +import itertools import operator +import re import sys -import pytest + import numpy as np +import pytest -import re -from distutils.version import LooseVersion -import itertools -from pandas import (Index, MultiIndex, DataFrame, DatetimeIndex, - Series, Categorical, SparseArray) - -from pandas.compat import OrderedDict, lrange -from pandas.core.arrays import ( - DatetimeArray, - TimedeltaArray, -) -from pandas.core.internals import (SingleBlockManager, - make_block, BlockManager) +from pandas._libs.internals import BlockPlacement +from pandas.compat import OrderedDict, lrange, u, zip + +import pandas as pd +from pandas import ( + Categorical, DataFrame, DatetimeIndex, Index, MultiIndex, Series, + SparseArray) import pandas.core.algorithms as algos +from pandas.core.arrays import DatetimeArray, TimedeltaArray +from pandas.core.internals import BlockManager, SingleBlockManager, make_block import pandas.util.testing as tm -import pandas as pd -from pandas._libs.internals import BlockPlacement -from pandas.util.testing import (assert_almost_equal, assert_frame_equal, - randn, assert_series_equal) -from pandas.compat import zip, u +from pandas.util.testing import ( + assert_almost_equal, assert_frame_equal, assert_series_equal, randn) # in 3.6.1 a c-api slicing function changed, see src/compat_helper.h PY361 = LooseVersion(sys.version) >= LooseVersion('3.6.1') diff --git a/pandas/tests/tools/test_numeric.py b/pandas/tests/tools/test_numeric.py index a0a1364f4617e..537881f3a5e85 100644 --- a/pandas/tests/tools/test_numeric.py +++ b/pandas/tests/tools/test_numeric.py @@ -1,12 +1,12 @@ -import pytest import decimal import numpy as np +from numpy import iinfo +import pytest + import pandas as pd from pandas import to_numeric - from pandas.util import testing as tm -from numpy import iinfo class TestToNumeric(object): diff --git a/setup.cfg b/setup.cfg index 3b7d1da9a2b02..48c56caa0c8f7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -115,16 +115,6 @@ force_sort_within_sections=True skip= pandas/core/api.py, pandas/core/frame.py, - pandas/tests/api/test_types.py, - pandas/tests/api/test_api.py, - pandas/tests/tools/test_numeric.py, - pandas/tests/internals/test_internals.py, - pandas/tests/extension/test_sparse.py, - pandas/tests/extension/base/reduce.py, - pandas/tests/computation/test_compat.py, - pandas/tests/computation/test_eval.py, - pandas/types/common.py, - pandas/tests/extension/arrow/test_bool.py, doc/source/conf.py, asv_bench/benchmarks/algorithms.py, asv_bench/benchmarks/attrs_caching.py, From 3c6cebb6052d89be6c60119bd174a6f1c0e89501 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Sat, 12 Jan 2019 20:50:15 +0000 Subject: [PATCH 2/4] Pep8 --- pandas/tests/extension/arrow/test_bool.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/tests/extension/arrow/test_bool.py b/pandas/tests/extension/arrow/test_bool.py index 0e9f56698508d..c4382a62d347b 100644 --- a/pandas/tests/extension/arrow/test_bool.py +++ b/pandas/tests/extension/arrow/test_bool.py @@ -10,7 +10,6 @@ pytest.importorskip('pyarrow', minversion="0.10.0") - @pytest.fixture def dtype(): return ArrowBoolDtype() From a52fe26d90ce57c62a4236f170858b578f328762 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Sat, 12 Jan 2019 22:15:32 +0000 Subject: [PATCH 3/4] add skip --- pandas/tests/extension/arrow/test_bool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/extension/arrow/test_bool.py b/pandas/tests/extension/arrow/test_bool.py index c4382a62d347b..a7a1386a365a4 100644 --- a/pandas/tests/extension/arrow/test_bool.py +++ b/pandas/tests/extension/arrow/test_bool.py @@ -5,10 +5,10 @@ from pandas.tests.extension import base import pandas.util.testing as tm -from .bool import ArrowBoolArray, ArrowBoolDtype - pytest.importorskip('pyarrow', minversion="0.10.0") +from .bool import ArrowBoolArray, ArrowBoolDtype # isort:skip + @pytest.fixture def dtype(): From 47478cc76a0cda58c0db020440946938c92661ce Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Sat, 12 Jan 2019 22:30:11 +0000 Subject: [PATCH 4/4] pep8 --- pandas/tests/extension/arrow/test_bool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/arrow/test_bool.py b/pandas/tests/extension/arrow/test_bool.py index a7a1386a365a4..15ceb6adff59c 100644 --- a/pandas/tests/extension/arrow/test_bool.py +++ b/pandas/tests/extension/arrow/test_bool.py @@ -7,7 +7,7 @@ pytest.importorskip('pyarrow', minversion="0.10.0") -from .bool import ArrowBoolArray, ArrowBoolDtype # isort:skip +from .bool import ArrowBoolArray, ArrowBoolDtype # isort:skip @pytest.fixture