Skip to content

Commit 6c493f6

Browse files
mwossPingviinituutti
mwoss
authored and
Pingviinituutti
committed
Fix import format at pandas/tests/io/plotting directory (pandas-dev#24580)
1 parent 134b06f commit 6c493f6

File tree

10 files changed

+83
-88
lines changed

10 files changed

+83
-88
lines changed

‎pandas/tests/plotting/common.py‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
#!/usr/bin/env python
22
# coding: utf-8
33

4-
import pytest
54
import os
65
import warnings
76

8-
from pandas import DataFrame, Series
9-
from pandas.compat import zip, iteritems
7+
import numpy as np
8+
from numpy import random
9+
import pytest
10+
11+
from pandas.compat import iteritems, zip
1012
from pandas.util._decorators import cache_readonly
11-
from pandas.core.dtypes.api import is_list_like
12-
import pandas.util.testing as tm
13-
from pandas.util.testing import (ensure_clean,
14-
assert_is_valid_plot_return_object)
1513
import pandas.util._test_decorators as td
1614

17-
import numpy as np
18-
from numpy import random
15+
from pandas.core.dtypes.api import is_list_like
16+
17+
from pandas import DataFrame, Series
18+
import pandas.util.testing as tm
19+
from pandas.util.testing import (
20+
assert_is_valid_plot_return_object, ensure_clean)
1921

2022
import pandas.plotting as plotting
2123
from pandas.plotting._tools import _flatten
2224

25+
2326
"""
2427
This is a common base class used for various plotting tests
2528
"""

‎pandas/tests/plotting/test_boxplot_method.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
# coding: utf-8
22

3-
import pytest
43
import itertools
54
import string
65

7-
from pandas import Series, DataFrame, MultiIndex
8-
from pandas.compat import range, lzip
9-
import pandas.util.testing as tm
10-
import pandas.util._test_decorators as td
11-
126
import numpy as np
137
from numpy import random
8+
import pytest
149

15-
import pandas.plotting as plotting
10+
from pandas.compat import lzip, range
11+
import pandas.util._test_decorators as td
1612

17-
from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works)
13+
from pandas import DataFrame, MultiIndex, Series
14+
from pandas.tests.plotting.common import TestPlotBase, _check_plot_works
15+
import pandas.util.testing as tm
1816

17+
import pandas.plotting as plotting
1918

2019
""" Test cases for .boxplot method """
2120

‎pandas/tests/plotting/test_converter.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1+
from datetime import date, datetime
12
import subprocess
23
import sys
3-
import pytest
4-
from datetime import datetime, date
54

65
import numpy as np
7-
from pandas import Timestamp, Period, Index, date_range, Series
6+
import pytest
7+
88
from pandas.compat import u
9+
from pandas.compat.numpy import np_datetime64_compat
10+
11+
from pandas import Index, Period, Series, Timestamp, date_range
912
import pandas.core.config as cf
1013
import pandas.util.testing as tm
11-
from pandas.tseries.offsets import Second, Milli, Micro, Day
12-
from pandas.compat.numpy import np_datetime64_compat
14+
15+
from pandas.tseries.offsets import Day, Micro, Milli, Second
1316

1417
converter = pytest.importorskip('pandas.plotting._converter')
15-
from pandas.plotting import (register_matplotlib_converters,
16-
deregister_matplotlib_converters)
18+
from pandas.plotting import (deregister_matplotlib_converters, # isort:skip
19+
register_matplotlib_converters)
1720

1821

1922
def test_timtetonum_accepts_unicode():

‎pandas/tests/plotting/test_datetimelike.py‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
""" Test cases for time series specific (freq conversion, etc) """
2-
import sys
3-
from datetime import datetime, timedelta, date, time
2+
from datetime import date, datetime, time, timedelta
43
import pickle
4+
import sys
55

6+
import numpy as np
67
import pytest
7-
from pandas.compat import lrange, zip
88

9-
import numpy as np
10-
from pandas import Index, Series, DataFrame, NaT, isna
11-
from pandas.compat import PY3
12-
from pandas.core.indexes.datetimes import date_range, bdate_range
9+
from pandas.compat import PY3, lrange, zip
10+
import pandas.util._test_decorators as td
11+
12+
from pandas import DataFrame, Index, NaT, Series, isna
13+
from pandas.core.indexes.datetimes import bdate_range, date_range
14+
from pandas.core.indexes.period import Period, PeriodIndex, period_range
1315
from pandas.core.indexes.timedeltas import timedelta_range
14-
from pandas.tseries.offsets import DateOffset
15-
from pandas.core.indexes.period import period_range, Period, PeriodIndex
1616
from pandas.core.resample import DatetimeIndex
17-
18-
from pandas.util.testing import assert_series_equal, ensure_clean
17+
from pandas.tests.plotting.common import (
18+
TestPlotBase, _skip_if_no_scipy_gaussian_kde)
1919
import pandas.util.testing as tm
20-
import pandas.util._test_decorators as td
20+
from pandas.util.testing import assert_series_equal, ensure_clean
2121

22-
from pandas.tests.plotting.common import (TestPlotBase,
23-
_skip_if_no_scipy_gaussian_kde)
22+
from pandas.tseries.offsets import DateOffset
2423

2524

2625
@td.skip_if_no_mpl

‎pandas/tests/plotting/test_frame.py‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@
22

33
""" Test cases for DataFrame.plot """
44

5-
import pytest
5+
from datetime import date, datetime
66
import string
77
import warnings
88

9-
from datetime import datetime, date
9+
import numpy as np
10+
from numpy.random import rand, randn
11+
import pytest
1012

11-
import pandas as pd
12-
from pandas import (Series, DataFrame, MultiIndex, PeriodIndex, date_range,
13-
bdate_range)
14-
from pandas.core.dtypes.api import is_list_like
15-
from pandas.compat import range, lrange, lmap, lzip, u, zip, PY3
16-
from pandas.io.formats.printing import pprint_thing
17-
import pandas.util.testing as tm
13+
from pandas.compat import PY3, lmap, lrange, lzip, range, u, zip
1814
import pandas.util._test_decorators as td
1915

20-
import numpy as np
21-
from numpy.random import rand, randn
16+
from pandas.core.dtypes.api import is_list_like
2217

18+
import pandas as pd
19+
from pandas import (
20+
DataFrame, MultiIndex, PeriodIndex, Series, bdate_range, date_range)
21+
from pandas.tests.plotting.common import (
22+
TestPlotBase, _check_plot_works, _ok_for_gaussian_kde,
23+
_skip_if_no_scipy_gaussian_kde)
24+
import pandas.util.testing as tm
25+
26+
from pandas.io.formats.printing import pprint_thing
2327
import pandas.plotting as plotting
24-
from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works,
25-
_skip_if_no_scipy_gaussian_kde,
26-
_ok_for_gaussian_kde)
2728

2829

2930
@td.skip_if_no_mpl

‎pandas/tests/plotting/test_groupby.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
""" Test cases for GroupBy.plot """
44

55

6-
from pandas import Series, DataFrame
7-
import pandas.util.testing as tm
8-
import pandas.util._test_decorators as td
9-
106
import numpy as np
117

8+
import pandas.util._test_decorators as td
9+
10+
from pandas import DataFrame, Series
1211
from pandas.tests.plotting.common import TestPlotBase
12+
import pandas.util.testing as tm
1313

1414

1515
@td.skip_if_no_mpl

‎pandas/tests/plotting/test_hist_method.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
""" Test cases for .hist method """
44

5+
import numpy as np
6+
from numpy.random import randn
57
import pytest
68

7-
from pandas import Series, DataFrame
8-
import pandas.util.testing as tm
99
import pandas.util._test_decorators as td
1010

11-
import numpy as np
12-
from numpy.random import randn
11+
from pandas import DataFrame, Series
12+
from pandas.tests.plotting.common import TestPlotBase, _check_plot_works
13+
import pandas.util.testing as tm
1314

14-
from pandas.plotting._core import grouped_hist
1515
from pandas.plotting._compat import _mpl_ge_2_2_0
16-
from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works)
16+
from pandas.plotting._core import grouped_hist
1717

1818

1919
@td.skip_if_no_mpl

‎pandas/tests/plotting/test_misc.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
""" Test cases for misc plot functions """
44

5+
import numpy as np
6+
from numpy import random
7+
from numpy.random import randn
58
import pytest
69

7-
from pandas import DataFrame
810
from pandas.compat import lmap
9-
import pandas.util.testing as tm
1011
import pandas.util._test_decorators as td
1112

12-
import numpy as np
13-
from numpy import random
14-
from numpy.random import randn
13+
from pandas import DataFrame
14+
from pandas.tests.plotting.common import TestPlotBase, _check_plot_works
15+
import pandas.util.testing as tm
1516

1617
import pandas.plotting as plotting
17-
from pandas.tests.plotting.common import TestPlotBase, _check_plot_works
1818

1919

2020
@td.skip_if_mpl

‎pandas/tests/plotting/test_series.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
""" Test cases for Series.plot """
44

55

6+
from datetime import datetime
67
from itertools import chain
8+
9+
import numpy as np
10+
from numpy.random import randn
711
import pytest
812

9-
from datetime import datetime
13+
from pandas.compat import lrange, range
14+
import pandas.util._test_decorators as td
1015

1116
import pandas as pd
12-
from pandas import Series, DataFrame, date_range
13-
from pandas.compat import range, lrange
17+
from pandas import DataFrame, Series, date_range
18+
from pandas.tests.plotting.common import (
19+
TestPlotBase, _check_plot_works, _ok_for_gaussian_kde,
20+
_skip_if_no_scipy_gaussian_kde)
1421
import pandas.util.testing as tm
15-
import pandas.util._test_decorators as td
16-
17-
import numpy as np
18-
from numpy.random import randn
1922

2023
import pandas.plotting as plotting
21-
from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works,
22-
_skip_if_no_scipy_gaussian_kde,
23-
_ok_for_gaussian_kde)
2424

2525

2626
@td.skip_if_no_mpl

‎setup.cfg‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,16 +122,6 @@ skip=
122122
pandas/tests/api/test_api.py,
123123
pandas/tests/tools/test_numeric.py,
124124
pandas/tests/internals/test_internals.py,
125-
pandas/tests/plotting/test_datetimelike.py,
126-
pandas/tests/plotting/test_series.py,
127-
pandas/tests/plotting/test_groupby.py,
128-
pandas/tests/plotting/test_converter.py,
129-
pandas/tests/plotting/test_misc.py,
130-
pandas/tests/plotting/test_frame.py,
131-
pandas/tests/plotting/test_hist_method.py,
132-
pandas/tests/plotting/common.py,
133-
pandas/tests/plotting/test_boxplot_method.py,
134-
pandas/tests/plotting/test_deprecated.py,
135125
pandas/tests/extension/test_sparse.py,
136126
pandas/tests/extension/base/reduce.py,
137127
pandas/tests/computation/test_compat.py,

0 commit comments

Comments
 (0)