From 870e489f7a8d953f4dc29f517ccca8bbdad0a4ef Mon Sep 17 00:00:00 2001 From: Lord and Master of All Things Big and Small Date: Thu, 25 Oct 2018 20:39:54 -0500 Subject: [PATCH 1/3] Fix import format tests/indexing --- pandas/tests/indexing/common.py | 11 ++++++---- pandas/tests/indexing/conftest.py | 2 +- .../tests/indexing/interval/test_interval.py | 6 +++--- .../indexing/interval/test_interval_new.py | 5 ++--- pandas/tests/indexing/test_callable.py | 1 + pandas/tests/indexing/test_categorical.py | 16 +++++++------- .../indexing/test_chaining_and_caching.py | 10 +++++---- pandas/tests/indexing/test_coercion.py | 6 +++--- pandas/tests/indexing/test_datetime.py | 4 ++-- pandas/tests/indexing/test_floats.py | 13 ++++++------ pandas/tests/indexing/test_iloc.py | 12 +++++------ pandas/tests/indexing/test_indexing.py | 21 +++++++------------ pandas/tests/indexing/test_indexing_slow.py | 3 ++- pandas/tests/indexing/test_ix.py | 11 +++++----- pandas/tests/indexing/test_loc.py | 13 ++++++------ pandas/tests/indexing/test_multiindex.py | 11 ++++++---- pandas/tests/indexing/test_panel.py | 5 +++-- pandas/tests/indexing/test_partial.py | 6 +++--- pandas/tests/indexing/test_scalar.py | 8 +++---- pandas/tests/indexing/test_timedelta.py | 4 ++-- 20 files changed, 86 insertions(+), 82 deletions(-) diff --git a/pandas/tests/indexing/common.py b/pandas/tests/indexing/common.py index 127548bdaf106..3a01d8d6cef87 100644 --- a/pandas/tests/indexing/common.py +++ b/pandas/tests/indexing/common.py @@ -2,15 +2,18 @@ import itertools from warnings import catch_warnings, filterwarnings -import pytest + import numpy as np +import pytest +from pandas import ( + DataFrame, Float64Index, MultiIndex, Panel, Series, UInt64Index, + date_range +) from pandas.compat import lrange from pandas.core.dtypes.common import is_scalar -from pandas import (Series, DataFrame, Panel, date_range, UInt64Index, - Float64Index, MultiIndex) -from pandas.util import testing as tm from pandas.io.formats.printing import pprint_thing +from pandas.util import testing as tm _verbose = False diff --git a/pandas/tests/indexing/conftest.py b/pandas/tests/indexing/conftest.py index be1cf4800a2ef..587dcb1423b15 100644 --- a/pandas/tests/indexing/conftest.py +++ b/pandas/tests/indexing/conftest.py @@ -1,6 +1,6 @@ import numpy as np -import pytest +import pytest from pandas._libs import index as libindex diff --git a/pandas/tests/indexing/interval/test_interval.py b/pandas/tests/indexing/interval/test_interval.py index f2f59159032a2..28dd21f19d74d 100644 --- a/pandas/tests/indexing/interval/test_interval.py +++ b/pandas/tests/indexing/interval/test_interval.py @@ -1,9 +1,9 @@ -import pytest import numpy as np -import pandas as pd -from pandas import Series, DataFrame, IntervalIndex, Interval +import pandas as pd import pandas.util.testing as tm +import pytest +from pandas import DataFrame, Interval, IntervalIndex, Series class TestIntervalIndex(object): diff --git a/pandas/tests/indexing/interval/test_interval_new.py b/pandas/tests/indexing/interval/test_interval_new.py index 3eb5f38ba0c80..053be61e610d0 100644 --- a/pandas/tests/indexing/interval/test_interval_new.py +++ b/pandas/tests/indexing/interval/test_interval_new.py @@ -1,9 +1,8 @@ -import pytest import numpy as np -from pandas import Series, IntervalIndex, Interval import pandas.util.testing as tm - +import pytest +from pandas import Interval, IntervalIndex, Series pytestmark = pytest.mark.skip(reason="new indexing tests for issue 16316") diff --git a/pandas/tests/indexing/test_callable.py b/pandas/tests/indexing/test_callable.py index 95b406517be62..d8f65c211a115 100644 --- a/pandas/tests/indexing/test_callable.py +++ b/pandas/tests/indexing/test_callable.py @@ -2,6 +2,7 @@ # pylint: disable-msg=W0612,E1101 import numpy as np + import pandas as pd import pandas.util.testing as tm diff --git a/pandas/tests/indexing/test_categorical.py b/pandas/tests/indexing/test_categorical.py index 634ad0d8160ed..44e5c5c0d5414 100644 --- a/pandas/tests/indexing/test_categorical.py +++ b/pandas/tests/indexing/test_categorical.py @@ -1,17 +1,19 @@ # -*- coding: utf-8 -*- -import pytest +import numpy as np import pandas as pd import pandas.compat as compat -import numpy as np -from pandas import (Series, DataFrame, Timestamp, Categorical, - CategoricalIndex, Interval, Index) -from pandas.util.testing import assert_series_equal, assert_frame_equal -from pandas.util import testing as tm -from pandas.core.dtypes.common import is_categorical_dtype +import pytest +from pandas import ( + Categorical, CategoricalIndex, DataFrame, Index, Interval, Series, + Timestamp +) from pandas.api.types import CategoricalDtype as CDT +from pandas.core.dtypes.common import is_categorical_dtype from pandas.core.dtypes.dtypes import CategoricalDtype +from pandas.util import testing as tm +from pandas.util.testing import assert_frame_equal, assert_series_equal class TestCategoricalIndex(object): diff --git a/pandas/tests/indexing/test_chaining_and_caching.py b/pandas/tests/indexing/test_chaining_and_caching.py index a7e55cdf9936e..2bf2e858a4a87 100644 --- a/pandas/tests/indexing/test_chaining_and_caching.py +++ b/pandas/tests/indexing/test_chaining_and_caching.py @@ -1,10 +1,12 @@ -import pytest - import numpy as np + import pandas as pd +import pytest +from pandas import ( + DataFrame, MultiIndex, Series, Timestamp, compat, date_range, + option_context +) from pandas.core import common as com -from pandas import (compat, DataFrame, option_context, - Series, MultiIndex, date_range, Timestamp) from pandas.util import testing as tm diff --git a/pandas/tests/indexing/test_coercion.py b/pandas/tests/indexing/test_coercion.py index 2f44cb36eeb11..23d1ea39a3724 100644 --- a/pandas/tests/indexing/test_coercion.py +++ b/pandas/tests/indexing/test_coercion.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- import itertools -import pytest + import numpy as np import pandas as pd -import pandas.util.testing as tm import pandas.compat as compat - +import pandas.util.testing as tm +import pytest ############################################################### # Index / Series common tests which may trigger dtype coercions diff --git a/pandas/tests/indexing/test_datetime.py b/pandas/tests/indexing/test_datetime.py index df59390475da8..5fd1724f6e95c 100644 --- a/pandas/tests/indexing/test_datetime.py +++ b/pandas/tests/indexing/test_datetime.py @@ -1,10 +1,10 @@ from datetime import datetime, timedelta import numpy as np -import pandas as pd from dateutil import tz -from pandas import date_range, Index, DataFrame, Series, Timestamp +import pandas as pd +from pandas import DataFrame, Index, Series, Timestamp, date_range from pandas.util import testing as tm diff --git a/pandas/tests/indexing/test_floats.py b/pandas/tests/indexing/test_floats.py index 3773b432135b9..9ba06182aeda2 100644 --- a/pandas/tests/indexing/test_floats.py +++ b/pandas/tests/indexing/test_floats.py @@ -1,14 +1,15 @@ # -*- coding: utf-8 -*- -import pytest - from warnings import catch_warnings + import numpy as np -from pandas import (Series, DataFrame, Index, Float64Index, Int64Index, - RangeIndex) -from pandas.util.testing import assert_series_equal, assert_almost_equal -import pandas.util.testing as tm +import pandas.util.testing as tm +import pytest +from pandas import ( + DataFrame, Float64Index, Index, Int64Index, RangeIndex, Series +) +from pandas.util.testing import assert_almost_equal, assert_series_equal ignore_ix = pytest.mark.filterwarnings("ignore:\\n.ix:DeprecationWarning") diff --git a/pandas/tests/indexing/test_iloc.py b/pandas/tests/indexing/test_iloc.py index 538d9706d54d6..37432c05cda5d 100644 --- a/pandas/tests/indexing/test_iloc.py +++ b/pandas/tests/indexing/test_iloc.py @@ -1,16 +1,16 @@ """ test positional based indexing with iloc """ -import pytest - from warnings import catch_warnings, filterwarnings, simplefilter + import numpy as np import pandas as pd -from pandas.compat import lrange, lmap -from pandas import Series, DataFrame, date_range, concat, isna -from pandas.util import testing as tm -from pandas.tests.indexing.common import Base +import pytest +from pandas import DataFrame, Series, concat, date_range, isna from pandas.api.types import is_scalar +from pandas.compat import lmap, lrange +from pandas.tests.indexing.common import Base +from pandas.util import testing as tm class TestiLoc(Base): diff --git a/pandas/tests/indexing/test_indexing.py b/pandas/tests/indexing/test_indexing.py index def0da4fcd6bd..4c145d3396734 100644 --- a/pandas/tests/indexing/test_indexing.py +++ b/pandas/tests/indexing/test_indexing.py @@ -3,28 +3,23 @@ """ test fancy indexing & misc """ -import pytest - import weakref -from warnings import catch_warnings, simplefilter from datetime import datetime +from warnings import catch_warnings, simplefilter -from pandas.core.dtypes.common import ( - is_integer_dtype, - is_float_dtype) -from pandas.compat import range, lrange, lzip, StringIO import numpy as np import pandas as pd -from pandas.core.indexing import (_non_reducing_slice, _maybe_numeric_slice, - validate_indices) -from pandas import NaT, DataFrame, Index, Series, MultiIndex import pandas.util.testing as tm -from pandas.compat import PY2 - +import pytest +from pandas import DataFrame, Index, MultiIndex, NaT, Series +from pandas.compat import PY2, StringIO, lrange, lzip, range +from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype +from pandas.core.indexing import ( + _maybe_numeric_slice, _non_reducing_slice, validate_indices +) from pandas.tests.indexing.common import Base, _mklbl - # ------------------------------------------------------------------------ # Indexing test cases diff --git a/pandas/tests/indexing/test_indexing_slow.py b/pandas/tests/indexing/test_indexing_slow.py index 61e5fdd7b9562..be1e4565fec0c 100644 --- a/pandas/tests/indexing/test_indexing_slow.py +++ b/pandas/tests/indexing/test_indexing_slow.py @@ -3,10 +3,11 @@ import warnings import numpy as np + import pandas as pd -from pandas.core.api import Series, DataFrame, MultiIndex import pandas.util.testing as tm import pytest +from pandas.core.api import DataFrame, MultiIndex, Series class TestIndexingSlow(object): diff --git a/pandas/tests/indexing/test_ix.py b/pandas/tests/indexing/test_ix.py index 04d0e04b5651e..08e373a4dbe7a 100644 --- a/pandas/tests/indexing/test_ix.py +++ b/pandas/tests/indexing/test_ix.py @@ -1,17 +1,16 @@ """ test indexing with ix """ -import pytest - from warnings import catch_warnings import numpy as np -import pandas as pd -from pandas.core.dtypes.common import is_scalar +import pandas as pd +import pytest +from pandas import DataFrame, MultiIndex, Series, option_context from pandas.compat import lrange -from pandas import Series, DataFrame, option_context, MultiIndex -from pandas.util import testing as tm +from pandas.core.dtypes.common import is_scalar from pandas.errors import PerformanceWarning +from pandas.util import testing as tm def test_ix_deprecation(): diff --git a/pandas/tests/indexing/test_loc.py b/pandas/tests/indexing/test_loc.py index 4a597967d3d5d..ad640f60eae46 100644 --- a/pandas/tests/indexing/test_loc.py +++ b/pandas/tests/indexing/test_loc.py @@ -1,18 +1,17 @@ """ test label based indexing with loc """ import itertools -import pytest - from warnings import catch_warnings, filterwarnings + import numpy as np import pandas as pd -from pandas.compat import lrange, StringIO -from pandas import Series, DataFrame, Timestamp, date_range, MultiIndex, Index -from pandas.util import testing as tm -from pandas.tests.indexing.common import Base +import pytest +from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range from pandas.api.types import is_scalar -from pandas.compat import PY2 +from pandas.compat import PY2, StringIO, lrange +from pandas.tests.indexing.common import Base +from pandas.util import testing as tm class TestLoc(Base): diff --git a/pandas/tests/indexing/test_multiindex.py b/pandas/tests/indexing/test_multiindex.py index b8f80164e5402..9bab94b7c7d26 100644 --- a/pandas/tests/indexing/test_multiindex.py +++ b/pandas/tests/indexing/test_multiindex.py @@ -1,12 +1,15 @@ from warnings import catch_warnings -import pytest + import numpy as np + import pandas as pd -from pandas import (Panel, Series, MultiIndex, DataFrame, - Timestamp, Index, date_range) -from pandas.util import testing as tm +import pytest +from pandas import ( + DataFrame, Index, MultiIndex, Panel, Series, Timestamp, date_range +) from pandas.errors import PerformanceWarning, UnsortedIndexError from pandas.tests.indexing.common import _mklbl +from pandas.util import testing as tm @pytest.mark.filterwarnings("ignore:\\n.ix:DeprecationWarning") diff --git a/pandas/tests/indexing/test_panel.py b/pandas/tests/indexing/test_panel.py index 2cd05b5779f30..300ff02d4c4b3 100644 --- a/pandas/tests/indexing/test_panel.py +++ b/pandas/tests/indexing/test_panel.py @@ -1,9 +1,10 @@ -import pytest from warnings import catch_warnings import numpy as np + +import pytest +from pandas import DataFrame, Panel, date_range from pandas.util import testing as tm -from pandas import Panel, date_range, DataFrame @pytest.mark.filterwarnings("ignore:\\nPanel:FutureWarning") diff --git a/pandas/tests/indexing/test_partial.py b/pandas/tests/indexing/test_partial.py index 5910f462cb3df..21033edfec5b5 100644 --- a/pandas/tests/indexing/test_partial.py +++ b/pandas/tests/indexing/test_partial.py @@ -4,13 +4,13 @@ TOD: these should be split among the indexer tests """ -import pytest - from warnings import catch_warnings + import numpy as np import pandas as pd -from pandas import Series, DataFrame, Panel, Index, date_range +import pytest +from pandas import DataFrame, Index, Panel, Series, date_range from pandas.util import testing as tm diff --git a/pandas/tests/indexing/test_scalar.py b/pandas/tests/indexing/test_scalar.py index 91f006e23e878..de77a711ae7a3 100644 --- a/pandas/tests/indexing/test_scalar.py +++ b/pandas/tests/indexing/test_scalar.py @@ -1,13 +1,11 @@ """ test scalar indexing, including at and iat """ -import pytest - import numpy as np -from pandas import (Series, DataFrame, Timestamp, - Timedelta, date_range) -from pandas.util import testing as tm +import pytest +from pandas import DataFrame, Series, Timedelta, Timestamp, date_range from pandas.tests.indexing.common import Base +from pandas.util import testing as tm class TestScalar(Base): diff --git a/pandas/tests/indexing/test_timedelta.py b/pandas/tests/indexing/test_timedelta.py index 48ea49119356d..55aadd6d156fb 100644 --- a/pandas/tests/indexing/test_timedelta.py +++ b/pandas/tests/indexing/test_timedelta.py @@ -1,8 +1,8 @@ -import pytest +import numpy as np import pandas as pd +import pytest from pandas.util import testing as tm -import numpy as np class TestTimedeltaIndexing(object): From e141a562b58d2a1ae31dca338a609764e984e108 Mon Sep 17 00:00:00 2001 From: Lord and Master of All Things Big and Small Date: Thu, 25 Oct 2018 20:47:41 -0500 Subject: [PATCH 2/3] edited setup.cfg --- setup.cfg | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/setup.cfg b/setup.cfg index de3bd356e8f55..4ada87796d948 100644 --- a/setup.cfg +++ b/setup.cfg @@ -563,25 +563,6 @@ skip= pandas/tests/reshape/merge/test_merge_asof.py, pandas/tests/reshape/merge/test_join.py, pandas/tests/reshape/merge/test_merge_ordered.py, - pandas/tests/indexing/test_multiindex.py, - pandas/tests/indexing/test_indexing.py, - pandas/tests/indexing/test_scalar.py, - pandas/tests/indexing/test_timedelta.py, - pandas/tests/indexing/test_callable.py, - pandas/tests/indexing/test_datetime.py, - pandas/tests/indexing/test_ix.py, - pandas/tests/indexing/test_iloc.py, - pandas/tests/indexing/test_partial.py, - pandas/tests/indexing/test_indexing_slow.py, - pandas/tests/indexing/test_loc.py, - pandas/tests/indexing/test_floats.py, - pandas/tests/indexing/test_coercion.py, - pandas/tests/indexing/common.py, - pandas/tests/indexing/test_chaining_and_caching.py, - pandas/tests/indexing/test_panel.py, - pandas/tests/indexing/test_categorical.py, - pandas/tests/indexing/interval/test_interval_new.py, - pandas/tests/indexing/interval/test_interval.py, pandas/tests/sparse/test_indexing.py, pandas/tests/arrays/sparse/test_libsparse.py, pandas/tests/arrays/sparse/test_array.py, From 8f654d5564bc41122015b31df296522bc7cd7110 Mon Sep 17 00:00:00 2001 From: Lord and Master of All Things Big and Small Date: Fri, 26 Oct 2018 13:15:51 -0500 Subject: [PATCH 3/3] Not sure what happened, but apparently they needed to be resorted again --- pandas/tests/indexing/common.py | 2 +- pandas/tests/indexing/conftest.py | 2 +- pandas/tests/indexing/interval/test_interval.py | 2 +- pandas/tests/indexing/interval/test_interval_new.py | 2 +- pandas/tests/indexing/test_categorical.py | 2 +- pandas/tests/indexing/test_chaining_and_caching.py | 2 +- pandas/tests/indexing/test_coercion.py | 2 +- pandas/tests/indexing/test_floats.py | 2 +- pandas/tests/indexing/test_iloc.py | 2 +- pandas/tests/indexing/test_indexing.py | 2 +- pandas/tests/indexing/test_indexing_slow.py | 2 +- pandas/tests/indexing/test_ix.py | 2 +- pandas/tests/indexing/test_loc.py | 2 +- pandas/tests/indexing/test_multiindex.py | 2 +- pandas/tests/indexing/test_panel.py | 2 +- pandas/tests/indexing/test_partial.py | 2 +- pandas/tests/indexing/test_scalar.py | 2 +- pandas/tests/indexing/test_timedelta.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pandas/tests/indexing/common.py b/pandas/tests/indexing/common.py index 3a01d8d6cef87..1fd9bf86ff6ee 100644 --- a/pandas/tests/indexing/common.py +++ b/pandas/tests/indexing/common.py @@ -4,8 +4,8 @@ from warnings import catch_warnings, filterwarnings import numpy as np - import pytest + from pandas import ( DataFrame, Float64Index, MultiIndex, Panel, Series, UInt64Index, date_range diff --git a/pandas/tests/indexing/conftest.py b/pandas/tests/indexing/conftest.py index 587dcb1423b15..be1cf4800a2ef 100644 --- a/pandas/tests/indexing/conftest.py +++ b/pandas/tests/indexing/conftest.py @@ -1,6 +1,6 @@ import numpy as np - import pytest + from pandas._libs import index as libindex diff --git a/pandas/tests/indexing/interval/test_interval.py b/pandas/tests/indexing/interval/test_interval.py index 28dd21f19d74d..67fa31637fc25 100644 --- a/pandas/tests/indexing/interval/test_interval.py +++ b/pandas/tests/indexing/interval/test_interval.py @@ -1,8 +1,8 @@ import numpy as np +import pytest import pandas as pd import pandas.util.testing as tm -import pytest from pandas import DataFrame, Interval, IntervalIndex, Series diff --git a/pandas/tests/indexing/interval/test_interval_new.py b/pandas/tests/indexing/interval/test_interval_new.py index 053be61e610d0..080f2abdad7de 100644 --- a/pandas/tests/indexing/interval/test_interval_new.py +++ b/pandas/tests/indexing/interval/test_interval_new.py @@ -1,7 +1,7 @@ import numpy as np +import pytest import pandas.util.testing as tm -import pytest from pandas import Interval, IntervalIndex, Series pytestmark = pytest.mark.skip(reason="new indexing tests for issue 16316") diff --git a/pandas/tests/indexing/test_categorical.py b/pandas/tests/indexing/test_categorical.py index 44e5c5c0d5414..85f95e79cc003 100644 --- a/pandas/tests/indexing/test_categorical.py +++ b/pandas/tests/indexing/test_categorical.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import numpy as np +import pytest import pandas as pd import pandas.compat as compat -import pytest from pandas import ( Categorical, CategoricalIndex, DataFrame, Index, Interval, Series, Timestamp diff --git a/pandas/tests/indexing/test_chaining_and_caching.py b/pandas/tests/indexing/test_chaining_and_caching.py index 2bf2e858a4a87..3762585558082 100644 --- a/pandas/tests/indexing/test_chaining_and_caching.py +++ b/pandas/tests/indexing/test_chaining_and_caching.py @@ -1,7 +1,7 @@ import numpy as np +import pytest import pandas as pd -import pytest from pandas import ( DataFrame, MultiIndex, Series, Timestamp, compat, date_range, option_context diff --git a/pandas/tests/indexing/test_coercion.py b/pandas/tests/indexing/test_coercion.py index 23d1ea39a3724..643b6081d176a 100644 --- a/pandas/tests/indexing/test_coercion.py +++ b/pandas/tests/indexing/test_coercion.py @@ -3,11 +3,11 @@ import itertools import numpy as np +import pytest import pandas as pd import pandas.compat as compat import pandas.util.testing as tm -import pytest ############################################################### # Index / Series common tests which may trigger dtype coercions diff --git a/pandas/tests/indexing/test_floats.py b/pandas/tests/indexing/test_floats.py index 9ba06182aeda2..c7fe9959b048a 100644 --- a/pandas/tests/indexing/test_floats.py +++ b/pandas/tests/indexing/test_floats.py @@ -3,9 +3,9 @@ from warnings import catch_warnings import numpy as np +import pytest import pandas.util.testing as tm -import pytest from pandas import ( DataFrame, Float64Index, Index, Int64Index, RangeIndex, Series ) diff --git a/pandas/tests/indexing/test_iloc.py b/pandas/tests/indexing/test_iloc.py index 37432c05cda5d..e2b6a37096493 100644 --- a/pandas/tests/indexing/test_iloc.py +++ b/pandas/tests/indexing/test_iloc.py @@ -3,9 +3,9 @@ from warnings import catch_warnings, filterwarnings, simplefilter import numpy as np +import pytest import pandas as pd -import pytest from pandas import DataFrame, Series, concat, date_range, isna from pandas.api.types import is_scalar from pandas.compat import lmap, lrange diff --git a/pandas/tests/indexing/test_indexing.py b/pandas/tests/indexing/test_indexing.py index 4c145d3396734..e96e249743468 100644 --- a/pandas/tests/indexing/test_indexing.py +++ b/pandas/tests/indexing/test_indexing.py @@ -8,10 +8,10 @@ from warnings import catch_warnings, simplefilter import numpy as np +import pytest import pandas as pd import pandas.util.testing as tm -import pytest from pandas import DataFrame, Index, MultiIndex, NaT, Series from pandas.compat import PY2, StringIO, lrange, lzip, range from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype diff --git a/pandas/tests/indexing/test_indexing_slow.py b/pandas/tests/indexing/test_indexing_slow.py index be1e4565fec0c..9715fc2bb5946 100644 --- a/pandas/tests/indexing/test_indexing_slow.py +++ b/pandas/tests/indexing/test_indexing_slow.py @@ -3,10 +3,10 @@ import warnings import numpy as np +import pytest import pandas as pd import pandas.util.testing as tm -import pytest from pandas.core.api import DataFrame, MultiIndex, Series diff --git a/pandas/tests/indexing/test_ix.py b/pandas/tests/indexing/test_ix.py index 08e373a4dbe7a..0e99be31f6b93 100644 --- a/pandas/tests/indexing/test_ix.py +++ b/pandas/tests/indexing/test_ix.py @@ -3,9 +3,9 @@ from warnings import catch_warnings import numpy as np +import pytest import pandas as pd -import pytest from pandas import DataFrame, MultiIndex, Series, option_context from pandas.compat import lrange from pandas.core.dtypes.common import is_scalar diff --git a/pandas/tests/indexing/test_loc.py b/pandas/tests/indexing/test_loc.py index ad640f60eae46..9314c2bcc8415 100644 --- a/pandas/tests/indexing/test_loc.py +++ b/pandas/tests/indexing/test_loc.py @@ -4,9 +4,9 @@ from warnings import catch_warnings, filterwarnings import numpy as np +import pytest import pandas as pd -import pytest from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range from pandas.api.types import is_scalar from pandas.compat import PY2, StringIO, lrange diff --git a/pandas/tests/indexing/test_multiindex.py b/pandas/tests/indexing/test_multiindex.py index 9bab94b7c7d26..42d7b35a0a2fd 100644 --- a/pandas/tests/indexing/test_multiindex.py +++ b/pandas/tests/indexing/test_multiindex.py @@ -1,9 +1,9 @@ from warnings import catch_warnings import numpy as np +import pytest import pandas as pd -import pytest from pandas import ( DataFrame, Index, MultiIndex, Panel, Series, Timestamp, date_range ) diff --git a/pandas/tests/indexing/test_panel.py b/pandas/tests/indexing/test_panel.py index 300ff02d4c4b3..f8bc2b932df9d 100644 --- a/pandas/tests/indexing/test_panel.py +++ b/pandas/tests/indexing/test_panel.py @@ -1,8 +1,8 @@ from warnings import catch_warnings import numpy as np - import pytest + from pandas import DataFrame, Panel, date_range from pandas.util import testing as tm diff --git a/pandas/tests/indexing/test_partial.py b/pandas/tests/indexing/test_partial.py index 21033edfec5b5..0d596e713fcfc 100644 --- a/pandas/tests/indexing/test_partial.py +++ b/pandas/tests/indexing/test_partial.py @@ -7,9 +7,9 @@ from warnings import catch_warnings import numpy as np +import pytest import pandas as pd -import pytest from pandas import DataFrame, Index, Panel, Series, date_range from pandas.util import testing as tm diff --git a/pandas/tests/indexing/test_scalar.py b/pandas/tests/indexing/test_scalar.py index de77a711ae7a3..d45209fd277f1 100644 --- a/pandas/tests/indexing/test_scalar.py +++ b/pandas/tests/indexing/test_scalar.py @@ -1,8 +1,8 @@ """ test scalar indexing, including at and iat """ import numpy as np - import pytest + from pandas import DataFrame, Series, Timedelta, Timestamp, date_range from pandas.tests.indexing.common import Base from pandas.util import testing as tm diff --git a/pandas/tests/indexing/test_timedelta.py b/pandas/tests/indexing/test_timedelta.py index 55aadd6d156fb..29031c908bda4 100644 --- a/pandas/tests/indexing/test_timedelta.py +++ b/pandas/tests/indexing/test_timedelta.py @@ -1,7 +1,7 @@ import numpy as np +import pytest import pandas as pd -import pytest from pandas.util import testing as tm