Skip to content

Commit f1786f1

Browse files
amphyPingviinituutti
authored andcommitted
Fix import format pandas/tests/indexing (pandas-dev#23351)
1 parent f0b82be commit f1786f1

20 files changed

+83
-98
lines changed

pandas/tests/indexing/common.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22

33
import itertools
44
from warnings import catch_warnings, filterwarnings
5-
import pytest
5+
66
import numpy as np
7+
import pytest
78

9+
from pandas import (
10+
DataFrame, Float64Index, MultiIndex, Panel, Series, UInt64Index,
11+
date_range
12+
)
813
from pandas.compat import lrange
914
from pandas.core.dtypes.common import is_scalar
10-
from pandas import (Series, DataFrame, Panel, date_range, UInt64Index,
11-
Float64Index, MultiIndex)
12-
from pandas.util import testing as tm
1315
from pandas.io.formats.printing import pprint_thing
16+
from pandas.util import testing as tm
1417

1518
_verbose = False
1619

pandas/tests/indexing/interval/test_interval.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import pytest
21
import numpy as np
3-
import pandas as pd
2+
import pytest
43

5-
from pandas import Series, DataFrame, IntervalIndex, Interval
4+
import pandas as pd
65
import pandas.util.testing as tm
6+
from pandas import DataFrame, Interval, IntervalIndex, Series
77

88

99
class TestIntervalIndex(object):

pandas/tests/indexing/interval/test_interval_new.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import pytest
21
import numpy as np
2+
import pytest
33

4-
from pandas import Series, IntervalIndex, Interval
54
import pandas.util.testing as tm
6-
5+
from pandas import Interval, IntervalIndex, Series
76

87
pytestmark = pytest.mark.skip(reason="new indexing tests for issue 16316")
98

pandas/tests/indexing/test_callable.py

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# pylint: disable-msg=W0612,E1101
33

44
import numpy as np
5+
56
import pandas as pd
67
import pandas.util.testing as tm
78

pandas/tests/indexing/test_categorical.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
# -*- coding: utf-8 -*-
22

3+
import numpy as np
34
import pytest
45

56
import pandas as pd
67
import pandas.compat as compat
7-
import numpy as np
8-
from pandas import (Series, DataFrame, Timestamp, Categorical,
9-
CategoricalIndex, Interval, Index)
10-
from pandas.util.testing import assert_series_equal, assert_frame_equal
11-
from pandas.util import testing as tm
12-
from pandas.core.dtypes.common import is_categorical_dtype
8+
from pandas import (
9+
Categorical, CategoricalIndex, DataFrame, Index, Interval, Series,
10+
Timestamp
11+
)
1312
from pandas.api.types import CategoricalDtype as CDT
13+
from pandas.core.dtypes.common import is_categorical_dtype
1414
from pandas.core.dtypes.dtypes import CategoricalDtype
15+
from pandas.util import testing as tm
16+
from pandas.util.testing import assert_frame_equal, assert_series_equal
1517

1618

1719
class TestCategoricalIndex(object):

pandas/tests/indexing/test_chaining_and_caching.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
import numpy as np
12
import pytest
23

3-
import numpy as np
44
import pandas as pd
5+
from pandas import (
6+
DataFrame, MultiIndex, Series, Timestamp, compat, date_range,
7+
option_context
8+
)
59
from pandas.core import common as com
6-
from pandas import (compat, DataFrame, option_context,
7-
Series, MultiIndex, date_range, Timestamp)
810
from pandas.util import testing as tm
911

1012

pandas/tests/indexing/test_coercion.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# -*- coding: utf-8 -*-
22

33
import itertools
4-
import pytest
4+
55
import numpy as np
6+
import pytest
67

78
import pandas as pd
8-
import pandas.util.testing as tm
99
import pandas.compat as compat
10-
10+
import pandas.util.testing as tm
1111

1212
###############################################################
1313
# Index / Series common tests which may trigger dtype coercions

pandas/tests/indexing/test_datetime.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from datetime import datetime, timedelta
22

33
import numpy as np
4-
import pandas as pd
54
from dateutil import tz
65

7-
from pandas import date_range, Index, DataFrame, Series, Timestamp
6+
import pandas as pd
7+
from pandas import DataFrame, Index, Series, Timestamp, date_range
88
from pandas.util import testing as tm
99

1010

pandas/tests/indexing/test_floats.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
# -*- coding: utf-8 -*-
22

3-
import pytest
4-
53
from warnings import catch_warnings
4+
65
import numpy as np
7-
from pandas import (Series, DataFrame, Index, Float64Index, Int64Index,
8-
RangeIndex)
9-
from pandas.util.testing import assert_series_equal, assert_almost_equal
10-
import pandas.util.testing as tm
6+
import pytest
117

8+
import pandas.util.testing as tm
9+
from pandas import (
10+
DataFrame, Float64Index, Index, Int64Index, RangeIndex, Series
11+
)
12+
from pandas.util.testing import assert_almost_equal, assert_series_equal
1213

1314
ignore_ix = pytest.mark.filterwarnings("ignore:\\n.ix:DeprecationWarning")
1415

pandas/tests/indexing/test_iloc.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
""" test positional based indexing with iloc """
22

3-
import pytest
4-
53
from warnings import catch_warnings, filterwarnings, simplefilter
4+
65
import numpy as np
6+
import pytest
77

88
import pandas as pd
9-
from pandas.compat import lrange, lmap
10-
from pandas import Series, DataFrame, date_range, concat, isna
11-
from pandas.util import testing as tm
12-
from pandas.tests.indexing.common import Base
9+
from pandas import DataFrame, Series, concat, date_range, isna
1310
from pandas.api.types import is_scalar
11+
from pandas.compat import lmap, lrange
12+
from pandas.tests.indexing.common import Base
13+
from pandas.util import testing as tm
1414

1515

1616
class TestiLoc(Base):

pandas/tests/indexing/test_indexing.py

+8-13
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,23 @@
33

44
""" test fancy indexing & misc """
55

6-
import pytest
7-
86
import weakref
9-
from warnings import catch_warnings, simplefilter
107
from datetime import datetime
8+
from warnings import catch_warnings, simplefilter
119

12-
from pandas.core.dtypes.common import (
13-
is_integer_dtype,
14-
is_float_dtype)
15-
from pandas.compat import range, lrange, lzip, StringIO
1610
import numpy as np
11+
import pytest
1712

1813
import pandas as pd
19-
from pandas.core.indexing import (_non_reducing_slice, _maybe_numeric_slice,
20-
validate_indices)
21-
from pandas import NaT, DataFrame, Index, Series, MultiIndex
2214
import pandas.util.testing as tm
23-
from pandas.compat import PY2
24-
15+
from pandas import DataFrame, Index, MultiIndex, NaT, Series
16+
from pandas.compat import PY2, StringIO, lrange, lzip, range
17+
from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype
18+
from pandas.core.indexing import (
19+
_maybe_numeric_slice, _non_reducing_slice, validate_indices
20+
)
2521
from pandas.tests.indexing.common import Base, _mklbl
2622

27-
2823
# ------------------------------------------------------------------------
2924
# Indexing test cases
3025

pandas/tests/indexing/test_indexing_slow.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
import warnings
44

55
import numpy as np
6+
import pytest
7+
68
import pandas as pd
7-
from pandas.core.api import Series, DataFrame, MultiIndex
89
import pandas.util.testing as tm
9-
import pytest
10+
from pandas.core.api import DataFrame, MultiIndex, Series
1011

1112

1213
class TestIndexingSlow(object):

pandas/tests/indexing/test_ix.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
""" test indexing with ix """
22

3-
import pytest
4-
53
from warnings import catch_warnings
64

75
import numpy as np
8-
import pandas as pd
6+
import pytest
97

10-
from pandas.core.dtypes.common import is_scalar
8+
import pandas as pd
9+
from pandas import DataFrame, MultiIndex, Series, option_context
1110
from pandas.compat import lrange
12-
from pandas import Series, DataFrame, option_context, MultiIndex
13-
from pandas.util import testing as tm
11+
from pandas.core.dtypes.common import is_scalar
1412
from pandas.errors import PerformanceWarning
13+
from pandas.util import testing as tm
1514

1615

1716
def test_ix_deprecation():

pandas/tests/indexing/test_loc.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
""" test label based indexing with loc """
22

33
import itertools
4-
import pytest
5-
64
from warnings import catch_warnings, filterwarnings
5+
76
import numpy as np
7+
import pytest
88

99
import pandas as pd
10-
from pandas.compat import lrange, StringIO
11-
from pandas import Series, DataFrame, Timestamp, date_range, MultiIndex, Index
12-
from pandas.util import testing as tm
13-
from pandas.tests.indexing.common import Base
10+
from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range
1411
from pandas.api.types import is_scalar
15-
from pandas.compat import PY2
12+
from pandas.compat import PY2, StringIO, lrange
13+
from pandas.tests.indexing.common import Base
14+
from pandas.util import testing as tm
1615

1716

1817
class TestLoc(Base):

pandas/tests/indexing/test_multiindex.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from warnings import catch_warnings
2-
import pytest
2+
33
import numpy as np
4+
import pytest
5+
46
import pandas as pd
5-
from pandas import (Panel, Series, MultiIndex, DataFrame,
6-
Timestamp, Index, date_range)
7-
from pandas.util import testing as tm
7+
from pandas import (
8+
DataFrame, Index, MultiIndex, Panel, Series, Timestamp, date_range
9+
)
810
from pandas.errors import PerformanceWarning, UnsortedIndexError
911
from pandas.tests.indexing.common import _mklbl
12+
from pandas.util import testing as tm
1013

1114

1215
@pytest.mark.filterwarnings("ignore:\\n.ix:DeprecationWarning")

pandas/tests/indexing/test_panel.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import pytest
21
from warnings import catch_warnings
32

43
import numpy as np
4+
import pytest
5+
6+
from pandas import DataFrame, Panel, date_range
57
from pandas.util import testing as tm
6-
from pandas import Panel, date_range, DataFrame
78

89

910
@pytest.mark.filterwarnings("ignore:\\nPanel:FutureWarning")

pandas/tests/indexing/test_partial.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
TOD: these should be split among the indexer tests
55
"""
66

7-
import pytest
8-
97
from warnings import catch_warnings
8+
109
import numpy as np
10+
import pytest
1111

1212
import pandas as pd
13-
from pandas import Series, DataFrame, Panel, Index, date_range
13+
from pandas import DataFrame, Index, Panel, Series, date_range
1414
from pandas.util import testing as tm
1515

1616

pandas/tests/indexing/test_scalar.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
""" test scalar indexing, including at and iat """
22

3-
import pytest
4-
53
import numpy as np
4+
import pytest
65

7-
from pandas import (Series, DataFrame, Timestamp,
8-
Timedelta, date_range)
9-
from pandas.util import testing as tm
6+
from pandas import DataFrame, Series, Timedelta, Timestamp, date_range
107
from pandas.tests.indexing.common import Base
8+
from pandas.util import testing as tm
119

1210

1311
class TestScalar(Base):

pandas/tests/indexing/test_timedelta.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import numpy as np
12
import pytest
23

34
import pandas as pd
45
from pandas.util import testing as tm
5-
import numpy as np
66

77

88
class TestTimedeltaIndexing(object):

setup.cfg

-19
Original file line numberDiff line numberDiff line change
@@ -493,25 +493,6 @@ skip=
493493
pandas/tests/reshape/merge/test_merge_asof.py,
494494
pandas/tests/reshape/merge/test_join.py,
495495
pandas/tests/reshape/merge/test_merge_ordered.py,
496-
pandas/tests/indexing/test_multiindex.py,
497-
pandas/tests/indexing/test_indexing.py,
498-
pandas/tests/indexing/test_scalar.py,
499-
pandas/tests/indexing/test_timedelta.py,
500-
pandas/tests/indexing/test_callable.py,
501-
pandas/tests/indexing/test_datetime.py,
502-
pandas/tests/indexing/test_ix.py,
503-
pandas/tests/indexing/test_iloc.py,
504-
pandas/tests/indexing/test_partial.py,
505-
pandas/tests/indexing/test_indexing_slow.py,
506-
pandas/tests/indexing/test_loc.py,
507-
pandas/tests/indexing/test_floats.py,
508-
pandas/tests/indexing/test_coercion.py,
509-
pandas/tests/indexing/common.py,
510-
pandas/tests/indexing/test_chaining_and_caching.py,
511-
pandas/tests/indexing/test_panel.py,
512-
pandas/tests/indexing/test_categorical.py,
513-
pandas/tests/indexing/interval/test_interval_new.py,
514-
pandas/tests/indexing/interval/test_interval.py,
515496
pandas/tests/sparse/test_indexing.py,
516497
pandas/tests/arrays/sparse/test_libsparse.py,
517498
pandas/tests/arrays/sparse/test_array.py,

0 commit comments

Comments
 (0)