Skip to content

Commit 6473bc0

Browse files
committed
rerun isort| might be rebase related
1 parent 99bf0fc commit 6473bc0

17 files changed

+81
-70
lines changed

pandas/tests/indexes/interval/test_astype.py

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
from __future__ import division
22

3-
import pytest
43
import numpy as np
4+
import pytest
5+
6+
import pandas.util.testing as tm
57
from pandas import (
6-
Index,
7-
IntervalIndex,
8-
interval_range,
9-
CategoricalIndex,
10-
Timestamp,
11-
Timedelta,
12-
NaT)
8+
CategoricalIndex, Index, IntervalIndex, NaT, Timedelta, Timestamp,
9+
interval_range
10+
)
1311
from pandas.core.dtypes.dtypes import CategoricalDtype, IntervalDtype
14-
import pandas.util.testing as tm
1512

1613

1714
class Base(object):

pandas/tests/indexes/interval/test_construction.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
from __future__ import division
22

3-
import pytest
4-
import numpy as np
53
from functools import partial
64

5+
import numpy as np
6+
import pytest
7+
8+
import pandas.core.common as com
9+
import pandas.util.testing as tm
710
from pandas import (
8-
Interval, IntervalIndex, Index, Int64Index, Float64Index, Categorical,
9-
CategoricalIndex, date_range, timedelta_range, period_range, notna)
11+
Categorical, CategoricalIndex, Float64Index, Index, Int64Index, Interval,
12+
IntervalIndex, date_range, notna, period_range, timedelta_range
13+
)
1014
from pandas.compat import lzip
1115
from pandas.core.arrays import IntervalArray
1216
from pandas.core.dtypes.common import is_categorical_dtype
1317
from pandas.core.dtypes.dtypes import IntervalDtype
14-
import pandas.core.common as com
15-
import pandas.util.testing as tm
1618

1719

1820
@pytest.fixture(params=[None, 'foo'])

pandas/tests/indexes/interval/test_interval.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
from __future__ import division
22

3+
import re
34
from itertools import permutations
4-
import pytest
5+
56
import numpy as np
6-
import re
7+
import pytest
8+
9+
import pandas as pd
10+
import pandas.core.common as com
11+
import pandas.util.testing as tm
712
from pandas import (
8-
Interval, IntervalIndex, Index, isna, notna, interval_range, Timestamp,
9-
Timedelta, date_range, timedelta_range)
13+
Index, Interval, IntervalIndex, Timedelta, Timestamp, date_range,
14+
interval_range, isna, notna, timedelta_range
15+
)
1016
from pandas.compat import lzip
11-
import pandas.core.common as com
1217
from pandas.tests.indexes.common import Base
13-
import pandas.util.testing as tm
14-
import pandas as pd
1518

1619

1720
@pytest.fixture(scope='class', params=[None, 'foo'])

pandas/tests/indexes/interval/test_interval_new.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
from __future__ import division
22

3-
import pytest
43
import numpy as np
4+
import pytest
55

6-
from pandas import Interval, IntervalIndex, Int64Index
76
import pandas.util.testing as tm
8-
7+
from pandas import Int64Index, Interval, IntervalIndex
98

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

pandas/tests/indexes/interval/test_interval_range.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
from __future__ import division
22

3-
import pytest
4-
import numpy as np
53
from datetime import timedelta
4+
5+
import numpy as np
6+
import pytest
7+
8+
import pandas.util.testing as tm
69
from pandas import (
7-
Interval, IntervalIndex, Timestamp, Timedelta, DateOffset,
8-
interval_range, date_range, timedelta_range)
10+
DateOffset, Interval, IntervalIndex, Timedelta, Timestamp, date_range,
11+
interval_range, timedelta_range
12+
)
913
from pandas.core.dtypes.common import is_integer
1014
from pandas.tseries.offsets import Day
11-
import pandas.util.testing as tm
1215

1316

1417
@pytest.fixture(scope='class', params=[None, 'foo'])

pandas/tests/indexes/interval/test_interval_tree.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
from __future__ import division
22

3-
import pytest
43
import numpy as np
4+
import pytest
5+
6+
import pandas.util.testing as tm
57
from pandas import compat
68
from pandas._libs.interval import IntervalTree
7-
import pandas.util.testing as tm
89

910

1011
@pytest.fixture(

pandas/tests/indexes/timedeltas/test_arithmetic.py

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

3-
import pytest
4-
import numpy as np
53
from datetime import timedelta
64
from distutils.version import LooseVersion
75

6+
import numpy as np
7+
import pytest
8+
89
import pandas as pd
910
import pandas.util.testing as tm
10-
from pandas import (DatetimeIndex, TimedeltaIndex, Int64Index,
11-
timedelta_range, date_range,
12-
Series,
13-
Timestamp, Timedelta)
11+
from pandas import (
12+
DatetimeIndex, Int64Index, Series, Timedelta, TimedeltaIndex, Timestamp,
13+
date_range, timedelta_range
14+
)
1415
from pandas.errors import NullFrequencyError
1516

1617

pandas/tests/indexes/timedeltas/test_astype.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from datetime import timedelta
22

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

76
import pandas.util.testing as tm
8-
from pandas import (TimedeltaIndex, timedelta_range, Int64Index, Float64Index,
9-
Index, Timedelta, NaT)
7+
from pandas import (
8+
Float64Index, Index, Int64Index, NaT, Timedelta, TimedeltaIndex,
9+
timedelta_range
10+
)
1011

1112

1213
class TestTimedeltaIndex(object):

pandas/tests/indexes/timedeltas/test_construction.py

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

33
import numpy as np
4-
from datetime import timedelta
4+
import pytest
55

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

pandas/tests/indexes/timedeltas/test_indexing.py

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

3-
import pytest
43
import numpy as np
4+
import pytest
55

66
import pandas as pd
77
import pandas.util.testing as tm
8-
from pandas import TimedeltaIndex, timedelta_range, compat, Index, Timedelta
8+
from pandas import Index, Timedelta, TimedeltaIndex, compat, timedelta_range
99

1010

1111
class TestGetItem(object):

pandas/tests/indexes/timedeltas/test_ops.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import pytest
1+
from datetime import timedelta
22

33
import numpy as np
4-
from datetime import timedelta
4+
import pytest
55

66
import pandas as pd
77
import pandas.util.testing as tm
8-
from pandas import (Series, Timedelta, Timestamp, TimedeltaIndex,
9-
timedelta_range, to_timedelta)
8+
from pandas import (
9+
Series, Timedelta, TimedeltaIndex, Timestamp, timedelta_range,
10+
to_timedelta
11+
)
1012
from pandas._libs.tslib import iNaT
13+
from pandas.core.dtypes.generic import ABCDateOffset
1114
from pandas.tests.test_base import Ops
1215
from pandas.tseries.offsets import Day, Hour
13-
from pandas.core.dtypes.generic import ABCDateOffset
1416

1517

1618
class TestTimedeltaIndexOps(Ops):

pandas/tests/indexes/timedeltas/test_partial_slicing.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import pytest
2-
31
import numpy as np
4-
import pandas.util.testing as tm
2+
import pytest
53

64
import pandas as pd
7-
from pandas import Series, timedelta_range, Timedelta
5+
import pandas.util.testing as tm
6+
from pandas import Series, Timedelta, timedelta_range
87
from pandas.util.testing import assert_series_equal
98

109

pandas/tests/indexes/timedeltas/test_scalar_compat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import pandas as pd
99
import pandas.util.testing as tm
10-
from pandas import timedelta_range, Timedelta, TimedeltaIndex, Index, Series
10+
from pandas import Index, Series, Timedelta, TimedeltaIndex, timedelta_range
1111

1212

1313
class TestVectorizedTimedelta(object):

pandas/tests/indexes/timedeltas/test_setops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import pandas as pd
44
import pandas.util.testing as tm
5-
from pandas import TimedeltaIndex, timedelta_range, Int64Index
5+
from pandas import Int64Index, TimedeltaIndex, timedelta_range
66

77

88
class TestTimedeltaIndex(object):

pandas/tests/indexes/timedeltas/test_timedelta.py

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
import pytest
1+
from datetime import timedelta
22

33
import numpy as np
4-
from datetime import timedelta
4+
import pytest
55

66
import pandas as pd
77
import pandas.util.testing as tm
8-
from pandas import (timedelta_range, date_range, Series, Timedelta,
9-
TimedeltaIndex, Index, DataFrame,
10-
Int64Index)
11-
from pandas.util.testing import (assert_almost_equal, assert_series_equal,
12-
assert_index_equal)
8+
from pandas import (
9+
DataFrame, Index, Int64Index, Series, Timedelta, TimedeltaIndex,
10+
date_range, timedelta_range
11+
)
12+
from pandas.util.testing import (
13+
assert_almost_equal, assert_index_equal, assert_series_equal
14+
)
1315

1416
from ..datetimelike import DatetimeLike
1517

pandas/tests/indexes/timedeltas/test_timedelta_range.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import pytest
21
import numpy as np
2+
import pytest
3+
34
import pandas as pd
45
import pandas.util.testing as tm
6+
from pandas import timedelta_range, to_timedelta
57
from pandas.tseries.offsets import Day, Second
6-
from pandas import to_timedelta, timedelta_range
78

89

910
class TestTimedeltas(object):

pandas/tests/indexes/timedeltas/test_tools.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import pytest
2-
31
from datetime import time, timedelta
2+
43
import numpy as np
4+
import pytest
55

66
import pandas as pd
77
import pandas.util.testing as tm
8-
from pandas.util.testing import assert_series_equal
9-
from pandas import Series, to_timedelta, isna, TimedeltaIndex
8+
from pandas import Series, TimedeltaIndex, isna, to_timedelta
109
from pandas._libs.tslib import iNaT
10+
from pandas.util.testing import assert_series_equal
1111

1212

1313
class TestTimedeltas(object):

0 commit comments

Comments
 (0)