Skip to content

Fix import format at pandas/tests/io/plotting directory #24580

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.

Sign up for GitHub

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
Jan 4, 2019
Merged

Fix import format at pandas/tests/io/plotting directory #24580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
086dcee
Fix import format at pandas/tests/io/plotting directory
mwoss Jan 3, 2019
87357a0
Merge branch 'master' into issue-23334-plotting
mwoss Jan 4, 2019
6a740c8
Skip converters import
mwoss Jan 4, 2019
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
21 changes: 12 additions & 9 deletions pandas/tests/plotting/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
#!/usr/bin/env python
# coding: utf-8

import pytest
import os
import warnings

from pandas import DataFrame, Series
from pandas.compat import zip, iteritems
import numpy as np
from numpy import random
import pytest

from pandas.compat import iteritems, zip
from pandas.util._decorators import cache_readonly
from pandas.core.dtypes.api import is_list_like
import pandas.util.testing as tm
from pandas.util.testing import (ensure_clean,
assert_is_valid_plot_return_object)
import pandas.util._test_decorators as td

import numpy as np
from numpy import random
from pandas.core.dtypes.api import is_list_like

from pandas import DataFrame, Series
import pandas.util.testing as tm
from pandas.util.testing import (
assert_is_valid_plot_return_object, ensure_clean)

import pandas.plotting as plotting
from pandas.plotting._tools import _flatten


"""
This is a common base class used for various plotting tests
"""
Expand Down
15 changes: 7 additions & 8 deletions pandas/tests/plotting/test_boxplot_method.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
# coding: utf-8

import pytest
import itertools
import string

from pandas import Series, DataFrame, MultiIndex
from pandas.compat import range, lzip
import pandas.util.testing as tm
import pandas.util._test_decorators as td

import numpy as np
from numpy import random
import pytest

import pandas.plotting as plotting
from pandas.compat import lzip, range
import pandas.util._test_decorators as td

from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works)
from pandas import DataFrame, MultiIndex, Series
from pandas.tests.plotting.common import TestPlotBase, _check_plot_works
import pandas.util.testing as tm

import pandas.plotting as plotting

""" Test cases for .boxplot method """

Expand Down
17 changes: 10 additions & 7 deletions pandas/tests/plotting/test_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
from datetime import date, datetime
import subprocess
import sys
import pytest
from datetime import datetime, date

import numpy as np
from pandas import Timestamp, Period, Index, date_range, Series
import pytest

from pandas.compat import u
from pandas.compat.numpy import np_datetime64_compat

from pandas import Index, Period, Series, Timestamp, date_range
import pandas.core.config as cf
import pandas.util.testing as tm
from pandas.tseries.offsets import Second, Milli, Micro, Day
from pandas.compat.numpy import np_datetime64_compat

from pandas.tseries.offsets import Day, Micro, Milli, Second

converter = pytest.importorskip('pandas.plotting._converter')
from pandas.plotting import (register_matplotlib_converters,
deregister_matplotlib_converters)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I imagine you will need to use an isort:skip here

from pandas.plotting import (deregister_matplotlib_converters, # isort:skip
register_matplotlib_converters)


def test_timtetonum_accepts_unicode():
Expand Down
27 changes: 13 additions & 14 deletions pandas/tests/plotting/test_datetimelike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
""" Test cases for time series specific (freq conversion, etc) """
import sys
from datetime import datetime, timedelta, date, time
from datetime import date, datetime, time, timedelta
import pickle
import sys

import numpy as np
import pytest
from pandas.compat import lrange, zip

import numpy as np
from pandas import Index, Series, DataFrame, NaT, isna
from pandas.compat import PY3
from pandas.core.indexes.datetimes import date_range, bdate_range
from pandas.compat import PY3, lrange, zip
import pandas.util._test_decorators as td

from pandas import DataFrame, Index, NaT, Series, isna
from pandas.core.indexes.datetimes import bdate_range, date_range
from pandas.core.indexes.period import Period, PeriodIndex, period_range
from pandas.core.indexes.timedeltas import timedelta_range
from pandas.tseries.offsets import DateOffset
from pandas.core.indexes.period import period_range, Period, PeriodIndex
from pandas.core.resample import DatetimeIndex

from pandas.util.testing import assert_series_equal, ensure_clean
from pandas.tests.plotting.common import (
TestPlotBase, _skip_if_no_scipy_gaussian_kde)
import pandas.util.testing as tm
import pandas.util._test_decorators as td
from pandas.util.testing import assert_series_equal, ensure_clean

from pandas.tests.plotting.common import (TestPlotBase,
_skip_if_no_scipy_gaussian_kde)
from pandas.tseries.offsets import DateOffset


@td.skip_if_no_mpl
Expand Down
29 changes: 15 additions & 14 deletions pandas/tests/plotting/test_frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,29 @@

""" Test cases for DataFrame.plot """

import pytest
from datetime import date, datetime
import string
import warnings

from datetime import datetime, date
import numpy as np
from numpy.random import rand, randn
import pytest

import pandas as pd
from pandas import (Series, DataFrame, MultiIndex, PeriodIndex, date_range,
bdate_range)
from pandas.core.dtypes.api import is_list_like
from pandas.compat import range, lrange, lmap, lzip, u, zip, PY3
from pandas.io.formats.printing import pprint_thing
import pandas.util.testing as tm
from pandas.compat import PY3, lmap, lrange, lzip, range, u, zip
import pandas.util._test_decorators as td

import numpy as np
from numpy.random import rand, randn
from pandas.core.dtypes.api import is_list_like

import pandas as pd
from pandas import (
DataFrame, MultiIndex, PeriodIndex, Series, bdate_range, date_range)
from pandas.tests.plotting.common import (
TestPlotBase, _check_plot_works, _ok_for_gaussian_kde,
_skip_if_no_scipy_gaussian_kde)
import pandas.util.testing as tm

from pandas.io.formats.printing import pprint_thing
import pandas.plotting as plotting
from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works,
_skip_if_no_scipy_gaussian_kde,
_ok_for_gaussian_kde)


@td.skip_if_no_mpl
Expand Down
8 changes: 4 additions & 4 deletions pandas/tests/plotting/test_groupby.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
""" Test cases for GroupBy.plot """


from pandas import Series, DataFrame
import pandas.util.testing as tm
import pandas.util._test_decorators as td

import numpy as np

import pandas.util._test_decorators as td

from pandas import DataFrame, Series
from pandas.tests.plotting.common import TestPlotBase
import pandas.util.testing as tm


@td.skip_if_no_mpl
Expand Down
12 changes: 6 additions & 6 deletions pandas/tests/plotting/test_hist_method.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

""" Test cases for .hist method """

import numpy as np
from numpy.random import randn
import pytest

from pandas import Series, DataFrame
import pandas.util.testing as tm
import pandas.util._test_decorators as td

import numpy as np
from numpy.random import randn
from pandas import DataFrame, Series
from pandas.tests.plotting.common import TestPlotBase, _check_plot_works
import pandas.util.testing as tm

from pandas.plotting._core import grouped_hist
from pandas.plotting._compat import _mpl_ge_2_2_0
from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works)
from pandas.plotting._core import grouped_hist


@td.skip_if_no_mpl
Expand Down
12 changes: 6 additions & 6 deletions pandas/tests/plotting/test_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

""" Test cases for misc plot functions """

import numpy as np
from numpy import random
from numpy.random import randn
import pytest

from pandas import DataFrame
from pandas.compat import lmap
import pandas.util.testing as tm
import pandas.util._test_decorators as td

import numpy as np
from numpy import random
from numpy.random import randn
from pandas import DataFrame
from pandas.tests.plotting.common import TestPlotBase, _check_plot_works
import pandas.util.testing as tm

import pandas.plotting as plotting
from pandas.tests.plotting.common import TestPlotBase, _check_plot_works


@td.skip_if_mpl
Expand Down
20 changes: 10 additions & 10 deletions pandas/tests/plotting/test_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
""" Test cases for Series.plot """


from datetime import datetime
from itertools import chain

import numpy as np
from numpy.random import randn
import pytest

from datetime import datetime
from pandas.compat import lrange, range
import pandas.util._test_decorators as td

import pandas as pd
from pandas import Series, DataFrame, date_range
from pandas.compat import range, lrange
from pandas import DataFrame, Series, date_range
from pandas.tests.plotting.common import (
TestPlotBase, _check_plot_works, _ok_for_gaussian_kde,
_skip_if_no_scipy_gaussian_kde)
import pandas.util.testing as tm
import pandas.util._test_decorators as td

import numpy as np
from numpy.random import randn

import pandas.plotting as plotting
from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works,
_skip_if_no_scipy_gaussian_kde,
_ok_for_gaussian_kde)


@td.skip_if_no_mpl
Expand Down
10 changes: 0 additions & 10 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,6 @@ skip=
pandas/tests/api/test_api.py,
pandas/tests/tools/test_numeric.py,
pandas/tests/internals/test_internals.py,
pandas/tests/plotting/test_datetimelike.py,
pandas/tests/plotting/test_series.py,
pandas/tests/plotting/test_groupby.py,
pandas/tests/plotting/test_converter.py,
pandas/tests/plotting/test_misc.py,
pandas/tests/plotting/test_frame.py,
pandas/tests/plotting/test_hist_method.py,
pandas/tests/plotting/common.py,
pandas/tests/plotting/test_boxplot_method.py,
pandas/tests/plotting/test_deprecated.py,
pandas/tests/extension/test_sparse.py,
pandas/tests/extension/base/reduce.py,
pandas/tests/computation/test_compat.py,
Expand Down