Skip to content
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

Fix import format tests/indexes/multi Part Two #23339

Merged
merged 7 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
15 changes: 6 additions & 9 deletions pandas/tests/indexes/interval/test_astype.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
from __future__ import division

import pytest
import numpy as np
import pytest

import pandas.util.testing as tm
from pandas import (
Index,
IntervalIndex,
interval_range,
CategoricalIndex,
Timestamp,
Timedelta,
NaT)
CategoricalIndex, Index, IntervalIndex, NaT, Timedelta, Timestamp,
interval_range
)
from pandas.core.dtypes.dtypes import CategoricalDtype, IntervalDtype
import pandas.util.testing as tm


class Base(object):
Expand Down
14 changes: 8 additions & 6 deletions pandas/tests/indexes/interval/test_construction.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
from __future__ import division

import pytest
import numpy as np
from functools import partial

import numpy as np
import pytest

import pandas.core.common as com
import pandas.util.testing as tm
from pandas import (
Interval, IntervalIndex, Index, Int64Index, Float64Index, Categorical,
CategoricalIndex, date_range, timedelta_range, period_range, notna)
Categorical, CategoricalIndex, Float64Index, Index, Int64Index, Interval,
IntervalIndex, date_range, notna, period_range, timedelta_range
)
from pandas.compat import lzip
from pandas.core.arrays import IntervalArray
from pandas.core.dtypes.common import is_categorical_dtype
from pandas.core.dtypes.dtypes import IntervalDtype
import pandas.core.common as com
import pandas.util.testing as tm


@pytest.fixture(params=[None, 'foo'])
Expand Down
17 changes: 10 additions & 7 deletions pandas/tests/indexes/interval/test_interval.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
from __future__ import division

import re
from itertools import permutations
import pytest

import numpy as np
import re
import pytest

import pandas as pd
import pandas.core.common as com
import pandas.util.testing as tm
from pandas import (
Interval, IntervalIndex, Index, isna, notna, interval_range, Timestamp,
Timedelta, date_range, timedelta_range)
Index, Interval, IntervalIndex, Timedelta, Timestamp, date_range,
interval_range, isna, notna, timedelta_range
)
from pandas.compat import lzip
import pandas.core.common as com
from pandas.tests.indexes.common import Base
import pandas.util.testing as tm
import pandas as pd


@pytest.fixture(scope='class', params=[None, 'foo'])
Expand Down
5 changes: 2 additions & 3 deletions pandas/tests/indexes/interval/test_interval_new.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from __future__ import division

import pytest
import numpy as np
import pytest

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

from pandas import Int64Index, Interval, IntervalIndex

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

Expand Down
13 changes: 8 additions & 5 deletions pandas/tests/indexes/interval/test_interval_range.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
from __future__ import division

import pytest
import numpy as np
from datetime import timedelta

import numpy as np
import pytest

import pandas.util.testing as tm
from pandas import (
Interval, IntervalIndex, Timestamp, Timedelta, DateOffset,
interval_range, date_range, timedelta_range)
DateOffset, Interval, IntervalIndex, Timedelta, Timestamp, date_range,
interval_range, timedelta_range
)
from pandas.core.dtypes.common import is_integer
from pandas.tseries.offsets import Day
import pandas.util.testing as tm


@pytest.fixture(scope='class', params=[None, 'foo'])
Expand Down
5 changes: 3 additions & 2 deletions pandas/tests/indexes/interval/test_interval_tree.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from __future__ import division

import pytest
import numpy as np
import pytest

import pandas.util.testing as tm
from pandas import compat
from pandas._libs.interval import IntervalTree
import pandas.util.testing as tm


@pytest.fixture(
Expand Down
1 change: 1 addition & 0 deletions pandas/tests/indexes/multi/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import numpy as np
import pytest

from pandas import Index, MultiIndex


Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_analytics.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-

import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import Index, MultiIndex, date_range, period_range
from pandas.compat import lrange

Expand Down
5 changes: 3 additions & 2 deletions pandas/tests/indexes/multi/test_astype.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-

import numpy as np
import pandas.util.testing as tm
import pytest
from pandas.util.testing import assert_copy

import pandas.util.testing as tm
from pandas.core.dtypes.dtypes import CategoricalDtype
from pandas.util.testing import assert_copy


def test_astype(idx):
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@


import numpy as np
import pandas.util.testing as tm
import pytest

import pandas.util.testing as tm
from pandas import MultiIndex
from pandas.compat import PY3, long

Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_constructor.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import re

import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import Index, MultiIndex, date_range
from pandas._libs.tslib import Timestamp
from pandas.compat import lrange, range
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_contains.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-

import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import MultiIndex
from pandas.compat import PYPY

Expand Down
1 change: 1 addition & 0 deletions pandas/tests/indexes/multi/test_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@


import numpy as np

import pandas as pd
import pandas.util.testing as tm
from pandas import DataFrame, MultiIndex, date_range
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_copy.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

from copy import copy, deepcopy

import pandas.util.testing as tm
import pytest

import pandas.util.testing as tm
from pandas import MultiIndex


Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_drop.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@


import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import Index, MultiIndex
from pandas.compat import lrange
from pandas.errors import PerformanceWarning
Expand Down
8 changes: 4 additions & 4 deletions pandas/tests/indexes/multi/test_duplicates.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# -*- coding: utf-8 -*-

from itertools import product
import pytest

import numpy as np
import pytest

from pandas.compat import range, u
from pandas import MultiIndex, DatetimeIndex
from pandas._libs import hashtable
import pandas.util.testing as tm
from pandas import DatetimeIndex, MultiIndex
from pandas._libs import hashtable
from pandas.compat import range, u


@pytest.mark.parametrize('names', [None, ['first', 'second']])
Expand Down
1 change: 1 addition & 0 deletions pandas/tests/indexes/multi/test_equivalence.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@


import numpy as np

import pandas as pd
import pandas.util.testing as tm
from pandas import Index, MultiIndex, Series
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_get_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@


import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import CategoricalIndex, Index, MultiIndex
from pandas.compat import range

Expand Down
6 changes: 4 additions & 2 deletions pandas/tests/indexes/multi/test_indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@

import pandas as pd
import pandas.util.testing as tm
from pandas import (Categorical, CategoricalIndex, Index, IntervalIndex,
MultiIndex, date_range)
from pandas import (
Categorical, CategoricalIndex, Index, IntervalIndex, MultiIndex,
date_range
)
from pandas.compat import lrange
from pandas.core.indexes.base import InvalidIndexError
from pandas.util.testing import assert_almost_equal
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_integrity.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import re

import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import IntervalIndex, MultiIndex, RangeIndex
from pandas.compat import lrange, range
from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_join.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@


import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import Index, MultiIndex


Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_missing.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-

import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import Int64Index, MultiIndex, PeriodIndex, UInt64Index
from pandas._libs.tslib import iNaT
from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_monotonic.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-

import numpy as np
import pandas as pd
import pytest

import pandas as pd
from pandas import Index, IntervalIndex, MultiIndex


Expand Down
1 change: 1 addition & 0 deletions pandas/tests/indexes/multi/test_reindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@


import numpy as np

import pandas as pd
import pandas.util.testing as tm
from pandas import Index, MultiIndex
Expand Down
1 change: 1 addition & 0 deletions pandas/tests/indexes/multi/test_set_ops.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-

import numpy as np

import pandas as pd
import pandas.util.testing as tm
from pandas import MultiIndex, Series
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/indexes/multi/test_sorting.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import CategoricalIndex, DataFrame, Index, MultiIndex, RangeIndex
from pandas.compat import lrange
from pandas.errors import PerformanceWarning, UnsortedIndexError
Expand Down
13 changes: 7 additions & 6 deletions pandas/tests/indexes/timedeltas/test_arithmetic.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# -*- coding: utf-8 -*-

import pytest
import numpy as np
from datetime import timedelta
from distutils.version import LooseVersion

import numpy as np
import pytest

import pandas as pd
import pandas.util.testing as tm
from pandas import (DatetimeIndex, TimedeltaIndex, Int64Index,
timedelta_range, date_range,
Series,
Timestamp, Timedelta)
from pandas import (
DatetimeIndex, Int64Index, Series, Timedelta, TimedeltaIndex, Timestamp,
date_range, timedelta_range
)
from pandas.errors import NullFrequencyError


Expand Down
9 changes: 5 additions & 4 deletions pandas/tests/indexes/timedeltas/test_astype.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from datetime import timedelta

import pytest

import numpy as np
import pytest

import pandas.util.testing as tm
from pandas import (TimedeltaIndex, timedelta_range, Int64Index, Float64Index,
Index, Timedelta, NaT)
from pandas import (
Float64Index, Index, Int64Index, NaT, Timedelta, TimedeltaIndex,
timedelta_range
)


class TestTimedeltaIndex(object):
Expand Down
Loading