From f1f1fb76b903ad893065b0bd660bbf05debe472e Mon Sep 17 00:00:00 2001 From: mwoss Date: Fri, 26 Oct 2018 21:09:09 +0200 Subject: [PATCH 1/3] Fix import format at pandas/tests/extension directory --- pandas/tests/extension/arrow/bool.py | 5 ++-- pandas/tests/extension/arrow/test_bool.py | 4 +++- pandas/tests/extension/base/dtype.py | 1 + pandas/tests/extension/base/getitem.py | 2 +- pandas/tests/extension/base/groupby.py | 3 ++- pandas/tests/extension/base/methods.py | 2 +- pandas/tests/extension/base/ops.py | 5 ++-- pandas/tests/extension/base/reduce.py | 5 +++- pandas/tests/extension/base/reshaping.py | 2 +- pandas/tests/extension/base/setitem.py | 1 + pandas/tests/extension/decimal/array.py | 3 +-- .../tests/extension/decimal/test_decimal.py | 10 ++++---- pandas/tests/extension/json/array.py | 2 +- pandas/tests/extension/json/test_json.py | 2 +- pandas/tests/extension/test_categorical.py | 8 +++---- pandas/tests/extension/test_common.py | 2 +- pandas/tests/extension/test_external_block.py | 6 ++--- pandas/tests/extension/test_integer.py | 12 +++++----- pandas/tests/extension/test_interval.py | 4 ++-- pandas/tests/extension/test_sparse.py | 6 ++--- setup.cfg | 24 ------------------- 21 files changed, 46 insertions(+), 63 deletions(-) diff --git a/pandas/tests/extension/arrow/bool.py b/pandas/tests/extension/arrow/bool.py index d595879e3cb7d..56ebab3a190c9 100644 --- a/pandas/tests/extension/arrow/bool.py +++ b/pandas/tests/extension/arrow/bool.py @@ -9,10 +9,11 @@ import itertools import numpy as np -import pyarrow as pa + import pandas as pd +import pyarrow as pa from pandas.api.extensions import ( - ExtensionDtype, ExtensionArray, take, register_extension_dtype + ExtensionArray, ExtensionDtype, register_extension_dtype, take ) diff --git a/pandas/tests/extension/arrow/test_bool.py b/pandas/tests/extension/arrow/test_bool.py index 5a01533cfc564..d89f3e6ebb099 100644 --- a/pandas/tests/extension/arrow/test_bool.py +++ b/pandas/tests/extension/arrow/test_bool.py @@ -1,12 +1,14 @@ import numpy as np import pytest + import pandas as pd import pandas.util.testing as tm from pandas.tests.extension import base +from .bool import ArrowBoolArray, ArrowBoolDtype + pytest.importorskip('pyarrow', minversion="0.10.0") -from .bool import ArrowBoolDtype, ArrowBoolArray @pytest.fixture diff --git a/pandas/tests/extension/base/dtype.py b/pandas/tests/extension/base/dtype.py index d5cf9571e3622..e9d1f183812cc 100644 --- a/pandas/tests/extension/base/dtype.py +++ b/pandas/tests/extension/base/dtype.py @@ -1,6 +1,7 @@ import warnings import numpy as np + import pandas as pd from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/getitem.py b/pandas/tests/extension/base/getitem.py index 22b21102fa4ae..00bb3b5d4eec2 100644 --- a/pandas/tests/extension/base/getitem.py +++ b/pandas/tests/extension/base/getitem.py @@ -1,5 +1,5 @@ -import pytest import numpy as np +import pytest import pandas as pd import pandas.util.testing as tm diff --git a/pandas/tests/extension/base/groupby.py b/pandas/tests/extension/base/groupby.py index 52c635d286df6..dd406ca0cd5ed 100644 --- a/pandas/tests/extension/base/groupby.py +++ b/pandas/tests/extension/base/groupby.py @@ -1,7 +1,8 @@ import pytest -import pandas.util.testing as tm import pandas as pd +import pandas.util.testing as tm + from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/methods.py b/pandas/tests/extension/base/methods.py index dce91d5a9ca9c..f7649415f2471 100644 --- a/pandas/tests/extension/base/methods.py +++ b/pandas/tests/extension/base/methods.py @@ -1,5 +1,5 @@ -import pytest import numpy as np +import pytest import pandas as pd import pandas.util.testing as tm diff --git a/pandas/tests/extension/base/ops.py b/pandas/tests/extension/base/ops.py index 7baa6284e398f..2161214190be0 100644 --- a/pandas/tests/extension/base/ops.py +++ b/pandas/tests/extension/base/ops.py @@ -1,9 +1,10 @@ -import pytest - import operator +import pytest + import pandas as pd from pandas.core import ops + from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/reduce.py b/pandas/tests/extension/base/reduce.py index 4f6c7988314c0..c4b70f2013265 100644 --- a/pandas/tests/extension/base/reduce.py +++ b/pandas/tests/extension/base/reduce.py @@ -1,7 +1,10 @@ import warnings + import pytest -import pandas.util.testing as tm + import pandas as pd +import pandas.util.testing as tm + from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/reshaping.py b/pandas/tests/extension/base/reshaping.py index 7f13c2cd67373..446912b66bf33 100644 --- a/pandas/tests/extension/base/reshaping.py +++ b/pandas/tests/extension/base/reshaping.py @@ -1,5 +1,5 @@ -import pytest import numpy as np +import pytest import pandas as pd from pandas.core.internals import ExtensionBlock diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index 029a77acb121f..72316b5b7eb91 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -5,6 +5,7 @@ import pandas as pd import pandas.util.testing as tm + from .base import BaseExtensionTests diff --git a/pandas/tests/extension/decimal/array.py b/pandas/tests/extension/decimal/array.py index fe07aae61c5e2..e47b8049ae65c 100644 --- a/pandas/tests/extension/decimal/array.py +++ b/pandas/tests/extension/decimal/array.py @@ -6,8 +6,7 @@ import numpy as np import pandas as pd -from pandas.core.arrays import (ExtensionArray, - ExtensionScalarOpsMixin) +from pandas.core.arrays import ExtensionArray, ExtensionScalarOpsMixin from pandas.core.dtypes.base import ExtensionDtype diff --git a/pandas/tests/extension/decimal/test_decimal.py b/pandas/tests/extension/decimal/test_decimal.py index be1c61166e4b1..59e77c3f0f3f3 100644 --- a/pandas/tests/extension/decimal/test_decimal.py +++ b/pandas/tests/extension/decimal/test_decimal.py @@ -1,15 +1,15 @@ -import operator import decimal +import operator import numpy as np -import pandas as pd -from pandas import compat -import pandas.util.testing as tm import pytest +import pandas as pd +import pandas.util.testing as tm +from pandas import compat from pandas.tests.extension import base -from .array import DecimalDtype, DecimalArray, make_data, to_decimal +from .array import DecimalArray, DecimalDtype, make_data, to_decimal @pytest.fixture diff --git a/pandas/tests/extension/json/array.py b/pandas/tests/extension/json/array.py index 5c63e50c3eaaa..75b0f6b02edad 100644 --- a/pandas/tests/extension/json/array.py +++ b/pandas/tests/extension/json/array.py @@ -20,8 +20,8 @@ import numpy as np from pandas import compat -from pandas.core.dtypes.base import ExtensionDtype from pandas.core.arrays import ExtensionArray +from pandas.core.dtypes.base import ExtensionDtype class JSONDtype(ExtensionDtype): diff --git a/pandas/tests/extension/json/test_json.py b/pandas/tests/extension/json/test_json.py index 15d99f6c5d2fc..d6528e3085527 100644 --- a/pandas/tests/extension/json/test_json.py +++ b/pandas/tests/extension/json/test_json.py @@ -1,5 +1,5 @@ -import operator import collections +import operator import pytest diff --git a/pandas/tests/extension/test_categorical.py b/pandas/tests/extension/test_categorical.py index a4518798aa400..b5ded1890ae64 100644 --- a/pandas/tests/extension/test_categorical.py +++ b/pandas/tests/extension/test_categorical.py @@ -15,14 +15,14 @@ """ import string -import pytest -import pandas as pd import numpy as np +import pytest -from pandas.api.types import CategoricalDtype +import pandas as pd +import pandas.util.testing as tm from pandas import Categorical +from pandas.api.types import CategoricalDtype from pandas.tests.extension import base -import pandas.util.testing as tm def make_data(): diff --git a/pandas/tests/extension/test_common.py b/pandas/tests/extension/test_common.py index a0a8f86a5d7b5..8a026a0c38283 100644 --- a/pandas/tests/extension/test_common.py +++ b/pandas/tests/extension/test_common.py @@ -4,8 +4,8 @@ import pandas as pd import pandas.util.testing as tm from pandas.core.arrays import ExtensionArray -from pandas.core.dtypes.common import is_extension_array_dtype from pandas.core.dtypes import dtypes +from pandas.core.dtypes.common import is_extension_array_dtype class DummyDtype(dtypes.ExtensionDtype): diff --git a/pandas/tests/extension/test_external_block.py b/pandas/tests/extension/test_external_block.py index aa32bf6051617..1b3f285e64059 100644 --- a/pandas/tests/extension/test_external_block.py +++ b/pandas/tests/extension/test_external_block.py @@ -2,14 +2,12 @@ # pylint: disable=W0102 import numpy as np +import pytest import pandas as pd -from pandas.core.internals import ( - BlockManager, SingleBlockManager) +from pandas.core.internals import BlockManager, SingleBlockManager from pandas.core.internals.blocks import Block, NonConsolidatableMixIn -import pytest - class CustomBlock(NonConsolidatableMixIn, Block): diff --git a/pandas/tests/extension/test_integer.py b/pandas/tests/extension/test_integer.py index 26b09d545378b..680cf83c64b9e 100644 --- a/pandas/tests/extension/test_integer.py +++ b/pandas/tests/extension/test_integer.py @@ -14,16 +14,16 @@ """ import numpy as np -import pandas as pd import pytest -from pandas.tests.extension import base -from pandas.core.dtypes.common import is_extension_array_dtype - +import pandas as pd from pandas.core.arrays import integer_array from pandas.core.arrays.integer import ( - Int8Dtype, Int16Dtype, Int32Dtype, Int64Dtype, - UInt8Dtype, UInt16Dtype, UInt32Dtype, UInt64Dtype) + Int8Dtype, Int16Dtype, Int32Dtype, Int64Dtype, UInt8Dtype, UInt16Dtype, + UInt32Dtype, UInt64Dtype +) +from pandas.core.dtypes.common import is_extension_array_dtype +from pandas.tests.extension import base def make_data(): diff --git a/pandas/tests/extension/test_interval.py b/pandas/tests/extension/test_interval.py index 183ebea927b10..3ffb88ef302e9 100644 --- a/pandas/tests/extension/test_interval.py +++ b/pandas/tests/extension/test_interval.py @@ -13,14 +13,14 @@ be added to the array-specific tests in `pandas/tests/arrays/`. """ -import pytest import numpy as np +import pytest +import pandas.util.testing as tm from pandas import Interval from pandas.core.arrays import IntervalArray from pandas.core.dtypes.dtypes import IntervalDtype from pandas.tests.extension import base -import pandas.util.testing as tm def make_data(): diff --git a/pandas/tests/extension/test_sparse.py b/pandas/tests/extension/test_sparse.py index 6946da6fdc36d..8c038b3950a26 100644 --- a/pandas/tests/extension/test_sparse.py +++ b/pandas/tests/extension/test_sparse.py @@ -1,11 +1,11 @@ -import pytest -import pandas as pd import numpy as np +import pytest +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/setup.cfg b/setup.cfg index a5006d66868f6..ce63507d58ca2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -337,28 +337,6 @@ skip= pandas/tests/util/test_testing.py, pandas/tests/util/test_util.py, pandas/tests/util/test_hashing.py, - pandas/tests/extension/test_common.py, - pandas/tests/extension/test_integer.py, - pandas/tests/extension/test_external_block.py, - pandas/tests/extension/test_interval.py, - pandas/tests/extension/test_categorical.py, - pandas/tests/extension/base/ops.py, - pandas/tests/extension/base/reshaping.py, - pandas/tests/extension/base/getitem.py, - pandas/tests/extension/base/groupby.py, - pandas/tests/extension/base/constructors.py, - pandas/tests/extension/base/interface.py, - pandas/tests/extension/base/dtype.py, - pandas/tests/extension/base/casting.py, - pandas/tests/extension/base/methods.py, - pandas/tests/extension/base/missing.py, - pandas/tests/extension/base/setitem.py, - pandas/tests/extension/arrow/test_bool.py, - pandas/tests/extension/arrow/bool.py, - pandas/tests/extension/decimal/array.py, - pandas/tests/extension/decimal/test_decimal.py, - pandas/tests/extension/json/array.py, - pandas/tests/extension/json/test_json.py, pandas/tests/io/test_clipboard.py, pandas/tests/io/test_compression.py, pandas/tests/io/test_pytables.py, @@ -578,8 +556,6 @@ skip= pandas/tests/arrays/sparse/test_libsparse.py, pandas/tests/arrays/sparse/test_array.py, pandas/tests/arrays/sparse/test_dtype.py, - pandas/tests/extension/test_sparse.py, - pandas/tests/extension/base/reduce.py, pandas/tests/sparse/test_reshape.py, pandas/tests/sparse/test_pivot.py, pandas/tests/sparse/test_format.py, From 4fe39f3d6827ba8ce184171c1c4768ff5c1bc804 Mon Sep 17 00:00:00 2001 From: mwoss Date: Sat, 27 Oct 2018 21:05:45 +0200 Subject: [PATCH 2/3] Add pytest.importoskip before bool module import to prevent build fail --- pandas/tests/extension/arrow/test_bool.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pandas/tests/extension/arrow/test_bool.py b/pandas/tests/extension/arrow/test_bool.py index d89f3e6ebb099..f259e66e6cc76 100644 --- a/pandas/tests/extension/arrow/test_bool.py +++ b/pandas/tests/extension/arrow/test_bool.py @@ -5,10 +5,9 @@ import pandas.util.testing as tm from pandas.tests.extension import base -from .bool import ArrowBoolArray, ArrowBoolDtype - pytest.importorskip('pyarrow', minversion="0.10.0") +from .bool import ArrowBoolArray, ArrowBoolDtype @pytest.fixture @@ -19,7 +18,7 @@ def dtype(): @pytest.fixture def data(): return ArrowBoolArray.from_scalars(np.random.randint(0, 2, size=100, - dtype=bool)) + dtype=bool)) @pytest.fixture From 0e5082cb648ab63f77137272f0d680780265d239 Mon Sep 17 00:00:00 2001 From: mwoss Date: Sun, 28 Oct 2018 13:45:44 +0100 Subject: [PATCH 3/3] Fix import order in bool.py, add extension/arrow/test_bool.py to skip param in setup.cfg due to errors from pep8 check --- pandas/tests/extension/arrow/bool.py | 2 +- setup.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/tests/extension/arrow/bool.py b/pandas/tests/extension/arrow/bool.py index 56ebab3a190c9..e6f997b01aad2 100644 --- a/pandas/tests/extension/arrow/bool.py +++ b/pandas/tests/extension/arrow/bool.py @@ -9,9 +9,9 @@ import itertools import numpy as np +import pyarrow as pa import pandas as pd -import pyarrow as pa from pandas.api.extensions import ( ExtensionArray, ExtensionDtype, register_extension_dtype, take ) diff --git a/setup.cfg b/setup.cfg index ce63507d58ca2..a291ce1af70c8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -585,3 +585,4 @@ skip= pandas/plotting/_misc.py, pandas/types/common.py, pandas/plotting/_compat.py, + pandas/tests/extension/arrow/test_bool.py