Skip to content

Commit d8c25ed

Browse files
mwossPingviinituutti
authored andcommitted
Fix import format at pandas/tests/io/arithmetic directory (pandas-dev#24579)
1 parent 93c315c commit d8c25ed

File tree

7 files changed

+34
-45
lines changed

7 files changed

+34
-45
lines changed

pandas/tests/arithmetic/conftest.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# -*- coding: utf-8 -*-
2-
import pytest
3-
42
import numpy as np
5-
import pandas as pd
3+
import pytest
64

75
from pandas.compat import long
8-
import pandas.util.testing as tm
96

7+
import pandas as pd
8+
import pandas.util.testing as tm
109

1110
# ------------------------------------------------------------------
1211
# Helper Functions
1312

13+
1414
def id_func(x):
1515
if isinstance(x, tuple):
1616
assert len(x) == 2

pandas/tests/arithmetic/test_datetime64.py

+9-12
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,26 @@
22
# Arithmetic tests for DataFrame/Series/Index/Array classes that should
33
# behave identically.
44
# Specifically for datetime64 and datetime64tz dtypes
5-
import operator
65
from datetime import datetime, timedelta
7-
import warnings
86
from itertools import product, starmap
7+
import operator
8+
import warnings
99

1010
import numpy as np
1111
import pytest
1212
import pytz
1313

14-
import pandas as pd
15-
import pandas.util.testing as tm
16-
17-
from pandas.compat.numpy import np_datetime64_compat
18-
from pandas.errors import PerformanceWarning, NullFrequencyError
19-
2014
from pandas._libs.tslibs.conversion import localize_pydatetime
2115
from pandas._libs.tslibs.offsets import shift_months
16+
from pandas.compat.numpy import np_datetime64_compat
17+
from pandas.errors import NullFrequencyError, PerformanceWarning
2218

23-
from pandas.core.indexes.datetimes import _to_M8
24-
19+
import pandas as pd
2520
from pandas import (
26-
Timestamp, Timedelta, Period, Series, date_range, NaT,
27-
DatetimeIndex, TimedeltaIndex)
21+
DatetimeIndex, NaT, Period, Series, Timedelta, TimedeltaIndex, Timestamp,
22+
date_range)
23+
from pandas.core.indexes.datetimes import _to_M8
24+
import pandas.util.testing as tm
2825

2926

3027
def assert_all(obj):

pandas/tests/arithmetic/test_numeric.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
from itertools import combinations
77
import operator
88

9-
import pytest
109
import numpy as np
11-
12-
import pandas as pd
13-
import pandas.util.testing as tm
10+
import pytest
1411

1512
from pandas.compat import PY3, Iterable
16-
from pandas.core import ops
17-
from pandas import Timedelta, Series, Index, TimedeltaIndex
1813

14+
import pandas as pd
15+
from pandas import Index, Series, Timedelta, TimedeltaIndex
16+
from pandas.core import ops
17+
import pandas.util.testing as tm
1918

2019
# ------------------------------------------------------------------
2120
# Comparisons
2221

22+
2323
class TestNumericComparisons(object):
2424
def test_operator_series_comparison_zerorank(self):
2525
# GH#13006

pandas/tests/arithmetic/test_object.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
# Specifically for object dtype
55
import operator
66

7-
import pytest
87
import numpy as np
8+
import pytest
99

1010
import pandas as pd
11-
import pandas.util.testing as tm
12-
from pandas.core import ops
13-
1411
from pandas import Series, Timestamp
15-
12+
from pandas.core import ops
13+
import pandas.util.testing as tm
1614

1715
# ------------------------------------------------------------------
1816
# Comparisons
1917

18+
2019
class TestObjectComparisons(object):
2120

2221
def test_comparison_object_numeric_nas(self):

pandas/tests/arithmetic/test_period.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
import numpy as np
88
import pytest
99

10-
import pandas as pd
11-
import pandas.util.testing as tm
12-
1310
from pandas._libs.tslibs.period import IncompatibleFrequency
1411
from pandas.errors import PerformanceWarning
1512

13+
import pandas as pd
14+
from pandas import Period, PeriodIndex, Series, period_range
1615
from pandas.core import ops
17-
from pandas import Period, PeriodIndex, period_range, Series
18-
from pandas.tseries.frequencies import to_offset
16+
import pandas.util.testing as tm
1917

18+
from pandas.tseries.frequencies import to_offset
2019

2120
# ------------------------------------------------------------------
2221
# Comparisons
2322

23+
2424
class TestPeriodIndexComparisons(object):
2525

2626
@pytest.mark.parametrize("other", ["2017", 2017])

pandas/tests/arithmetic/test_timedelta64.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@
33
# behave identically.
44
from datetime import datetime, timedelta
55

6-
import pytest
76
import numpy as np
8-
9-
import pandas as pd
10-
import pandas.util.testing as tm
7+
import pytest
118

129
from pandas.errors import NullFrequencyError, PerformanceWarning
10+
11+
import pandas as pd
1312
from pandas import (
14-
timedelta_range,
15-
Timedelta, Timestamp, NaT, Series, TimedeltaIndex, DatetimeIndex,
16-
DataFrame)
13+
DataFrame, DatetimeIndex, NaT, Series, Timedelta, TimedeltaIndex,
14+
Timestamp, timedelta_range)
15+
import pandas.util.testing as tm
1716

1817

1918
def get_upcast_box(box, vector):

setup.cfg

-6
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,6 @@ skip=
121121
pandas/tests/api/test_types.py,
122122
pandas/tests/api/test_api.py,
123123
pandas/tests/tools/test_numeric.py,
124-
pandas/tests/arithmetic/test_numeric.py,
125-
pandas/tests/arithmetic/test_object.py,
126-
pandas/tests/arithmetic/test_period.py,
127-
pandas/tests/arithmetic/test_datetime64.py,
128-
pandas/tests/arithmetic/conftest.py,
129-
pandas/tests/arithmetic/test_timedelta64.py,
130124
pandas/tests/internals/test_internals.py,
131125
pandas/tests/plotting/test_datetimelike.py,
132126
pandas/tests/plotting/test_series.py,

0 commit comments

Comments
 (0)