Skip to content

Fix import format pandas/tests/indexing #23351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pandas/tests/indexing/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions pandas/tests/indexing/interval/test_interval.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import pytest
import numpy as np
import pandas as pd
import pytest

from pandas import Series, DataFrame, IntervalIndex, Interval
import pandas as pd
import pandas.util.testing as tm
from pandas import DataFrame, Interval, IntervalIndex, Series


class TestIntervalIndex(object):
Expand Down
5 changes: 2 additions & 3 deletions pandas/tests/indexing/interval/test_interval_new.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import pytest
import numpy as np
import pytest

from pandas import Series, IntervalIndex, Interval
import pandas.util.testing as tm

from pandas import Interval, IntervalIndex, Series

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

Expand Down
1 change: 1 addition & 0 deletions pandas/tests/indexing/test_callable.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# pylint: disable-msg=W0612,E1101

import numpy as np

import pandas as pd
import pandas.util.testing as tm

Expand Down
14 changes: 8 additions & 6 deletions pandas/tests/indexing/test_categorical.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# -*- coding: utf-8 -*-

import numpy as np
import pytest

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
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):
Expand Down
8 changes: 5 additions & 3 deletions pandas/tests/indexing/test_chaining_and_caching.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import numpy as np
import pytest

import numpy as np
import pandas as pd
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


Expand Down
6 changes: 3 additions & 3 deletions pandas/tests/indexing/test_coercion.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-

import itertools
import pytest

import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pandas.compat as compat

import pandas.util.testing as tm

###############################################################
# Index / Series common tests which may trigger dtype coercions
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/indexing/test_datetime.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
13 changes: 7 additions & 6 deletions pandas/tests/indexing/test_floats.py
Original file line number Diff line number Diff line change
@@ -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 pytest

import pandas.util.testing as tm
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")

Expand Down
12 changes: 6 additions & 6 deletions pandas/tests/indexing/test_iloc.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
""" test positional based indexing with iloc """

import pytest

from warnings import catch_warnings, filterwarnings, simplefilter

import numpy as np
import pytest

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
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):
Expand Down
21 changes: 8 additions & 13 deletions pandas/tests/indexing/test_indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 pytest

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

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

Expand Down
5 changes: 3 additions & 2 deletions pandas/tests/indexing/test_indexing_slow.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
import warnings

import numpy as np
import pytest

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):
Expand Down
11 changes: 5 additions & 6 deletions pandas/tests/indexing/test_ix.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
""" test indexing with ix """

import pytest

from warnings import catch_warnings

import numpy as np
import pandas as pd
import pytest

from pandas.core.dtypes.common import is_scalar
import pandas as pd
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():
Expand Down
13 changes: 6 additions & 7 deletions pandas/tests/indexing/test_loc.py
Original file line number Diff line number Diff line change
@@ -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 pytest

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
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):
Expand Down
11 changes: 7 additions & 4 deletions pandas/tests/indexing/test_multiindex.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
from warnings import catch_warnings
import pytest

import numpy as np
import pytest

import pandas as pd
from pandas import (Panel, Series, MultiIndex, DataFrame,
Timestamp, Index, date_range)
from pandas.util import testing as tm
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")
Expand Down
5 changes: 3 additions & 2 deletions pandas/tests/indexing/test_panel.py
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
6 changes: 3 additions & 3 deletions pandas/tests/indexing/test_partial.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 pytest

import pandas as pd
from pandas import Series, DataFrame, Panel, Index, date_range
from pandas import DataFrame, Index, Panel, Series, date_range
from pandas.util import testing as tm


Expand Down
8 changes: 3 additions & 5 deletions pandas/tests/indexing/test_scalar.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
""" test scalar indexing, including at and iat """

import pytest

import numpy as np
import pytest

from pandas import (Series, DataFrame, Timestamp,
Timedelta, date_range)
from pandas.util import testing as tm
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):
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/indexing/test_timedelta.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import numpy as np
import pytest

import pandas as pd
from pandas.util import testing as tm
import numpy as np


class TestTimedeltaIndexing(object):
Expand Down
19 changes: 0 additions & 19 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down