Skip to content

isort plotting, a handful of test dirs #23957

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

Merged
merged 6 commits into from
Nov 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
2 changes: 1 addition & 1 deletion pandas/plotting/_compat.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# being a bit too dynamic
# pylint: disable=E1101
from __future__ import division
import operator

from distutils.version import LooseVersion
import operator


def _mpl_version(version, op):
Expand Down
29 changes: 11 additions & 18 deletions pandas/plotting/_converter.py
Original file line number Diff line number Diff line change
@@ -1,39 +1,32 @@
import warnings
from datetime import datetime, timedelta
import datetime as pydt
import numpy as np
from datetime import datetime, timedelta
import warnings

from dateutil.relativedelta import relativedelta

import matplotlib.units as units
import matplotlib.dates as dates

from matplotlib.ticker import Formatter, AutoLocator, Locator
from matplotlib.ticker import AutoLocator, Formatter, Locator
from matplotlib.transforms import nonsingular
import matplotlib.units as units
import numpy as np

from pandas._libs import tslibs
from pandas._libs.tslibs import resolution
import pandas.compat as compat
from pandas.compat import lrange

from pandas.core.dtypes.common import (
is_float, is_integer,
is_integer_dtype,
is_float_dtype,
is_datetime64_ns_dtype,
is_period_arraylike,
is_nested_list_like
)
is_datetime64_ns_dtype, is_float, is_float_dtype, is_integer,
is_integer_dtype, is_nested_list_like, is_period_arraylike)
from pandas.core.dtypes.generic import ABCSeries

from pandas.compat import lrange
import pandas.compat as compat
import pandas.core.common as com
from pandas.core.index import Index

from pandas.core.indexes.datetimes import date_range
from pandas.core.indexes.period import Period, PeriodIndex
import pandas.core.tools.datetimes as tools

import pandas.tseries.frequencies as frequencies
from pandas.tseries.frequencies import FreqGroup
from pandas.core.indexes.period import Period, PeriodIndex

# constants
HOURS_PER_DAY = 24.
Expand Down
39 changes: 16 additions & 23 deletions pandas/plotting/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,35 @@
# pylint: disable=E1101
from __future__ import division

import warnings
import re
from collections import namedtuple
from distutils.version import LooseVersion
import re
import warnings

import numpy as np

from pandas.util._decorators import cache_readonly, Appender
from pandas.compat import range, lrange, map, zip, string_types
import pandas.compat as compat
from pandas.compat import lrange, map, range, string_types, zip
from pandas.errors import AbstractMethodError
from pandas.util._decorators import Appender, cache_readonly

import pandas.core.common as com
from pandas.core.base import PandasObject
from pandas.core.config import get_option
from pandas.core.generic import _shared_docs, _shared_doc_kwargs

from pandas.core.dtypes.missing import isna, notna, remove_na_arraylike
from pandas.core.dtypes.common import (
is_list_like,
is_integer,
is_number,
is_hashable,
is_iterator)
is_hashable, is_integer, is_iterator, is_list_like, is_number)
from pandas.core.dtypes.generic import (
ABCSeries, ABCDataFrame, ABCPeriodIndex, ABCMultiIndex, ABCIndexClass)
ABCDataFrame, ABCIndexClass, ABCMultiIndex, ABCPeriodIndex, ABCSeries)
from pandas.core.dtypes.missing import isna, notna, remove_na_arraylike

from pandas.io.formats.printing import pprint_thing
from pandas.core.base import PandasObject
import pandas.core.common as com
from pandas.core.config import get_option
from pandas.core.generic import _shared_doc_kwargs, _shared_docs

from pandas.io.formats.printing import pprint_thing
from pandas.plotting._compat import _mpl_ge_3_0_0
from pandas.plotting._style import (plot_params,
_get_standard_colors)
from pandas.plotting._tools import (_subplots, _flatten, table,
_handle_shared_axes, _get_all_lines,
_get_xlim, _set_ticks_props,
format_date_labels)
from pandas.plotting._style import _get_standard_colors, plot_params
from pandas.plotting._tools import (
_flatten, _get_all_lines, _get_xlim, _handle_shared_axes, _set_ticks_props,
_subplots, format_date_labels, table)

try:
from pandas.plotting import _converter
Expand Down
8 changes: 4 additions & 4 deletions pandas/plotting/_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

import numpy as np

from pandas.compat import lmap, lrange, range, zip
from pandas.util._decorators import deprecate_kwarg
from pandas.core.dtypes.missing import notna
from pandas.compat import range, lrange, lmap, zip
from pandas.io.formats.printing import pprint_thing

from pandas.core.dtypes.missing import notna

from pandas.io.formats.printing import pprint_thing
from pandas.plotting._style import _get_standard_colors
from pandas.plotting._tools import _subplots, _set_ticks_props
from pandas.plotting._tools import _set_ticks_props, _subplots


def scatter_matrix(frame, alpha=0.5, figsize=None, ax=None, grid=False,
Expand Down
7 changes: 4 additions & 3 deletions pandas/plotting/_style.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
# pylint: disable=E1101
from __future__ import division

import warnings
from contextlib import contextmanager
import warnings

import numpy as np

from pandas.core.dtypes.common import is_list_like
from pandas.compat import lrange, lmap
import pandas.compat as compat
from pandas.compat import lmap, lrange

from pandas.core.dtypes.common import is_list_like


def _get_standard_colors(num_colors=None, colormap=None, color_type='default',
Expand Down
18 changes: 8 additions & 10 deletions pandas/plotting/_timeseries.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@

import functools

import numpy as np
from matplotlib import pylab
import numpy as np

from pandas._libs.tslibs.period import Period
import pandas.compat as compat

from pandas.core.dtypes.generic import (
ABCPeriodIndex, ABCDatetimeIndex, ABCTimedeltaIndex)

from pandas.tseries.offsets import DateOffset
import pandas.tseries.frequencies as frequencies
ABCDatetimeIndex, ABCPeriodIndex, ABCTimedeltaIndex)

from pandas.io.formats.printing import pprint_thing
import pandas.compat as compat

from pandas.plotting._converter import (TimeSeries_DateLocator,
TimeSeries_DateFormatter,
TimeSeries_TimedeltaFormatter)
from pandas.plotting._converter import (
TimeSeries_DateFormatter, TimeSeries_DateLocator,
TimeSeries_TimedeltaFormatter)
import pandas.tseries.frequencies as frequencies
from pandas.tseries.offsets import DateOffset

# ---------------------------------------------------------------------
# Plotting functions and monkey patches
Expand Down
7 changes: 4 additions & 3 deletions pandas/plotting/_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
# pylint: disable=E1101
from __future__ import division

import warnings
from math import ceil
import warnings

import numpy as np

from pandas.core.dtypes.common import is_list_like
from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass, ABCDataFrame
from pandas.compat import range

from pandas.core.dtypes.common import is_list_like
from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries


def format_date_labels(ax, rot):
# mini version of autofmt_xdate
Expand Down
17 changes: 8 additions & 9 deletions pandas/tests/generic/test_frame.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
# -*- coding: utf-8 -*-
# pylint: disable-msg=E1101,W0612

from operator import methodcaller
from copy import deepcopy
from distutils.version import LooseVersion
from operator import methodcaller

import pytest
import numpy as np
import pandas as pd

from pandas import Series, DataFrame, date_range, MultiIndex
import pytest

from pandas.compat import range
from pandas.util.testing import (assert_series_equal,
assert_frame_equal,
assert_almost_equal)
import pandas.util._test_decorators as td

import pandas as pd
from pandas import DataFrame, MultiIndex, Series, date_range
import pandas.util.testing as tm
import pandas.util._test_decorators as td
from pandas.util.testing import (
assert_almost_equal, assert_frame_equal, assert_series_equal)

from .test_generic import Generic

try:
Expand Down
20 changes: 9 additions & 11 deletions pandas/tests/generic/test_generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,25 @@
from copy import copy, deepcopy
from warnings import catch_warnings, simplefilter

import pytest
import numpy as np
import pandas as pd

from pandas.core.dtypes.common import is_scalar
from pandas import (Series, DataFrame, Panel,
date_range, MultiIndex)
import pytest

import pandas.io.formats.printing as printing
from pandas.compat import PY3, range, zip

from pandas.compat import range, zip, PY3
from pandas.util.testing import (assert_series_equal,
assert_panel_equal,
assert_frame_equal)
from pandas.core.dtypes.common import is_scalar

import pandas as pd
from pandas import DataFrame, MultiIndex, Panel, Series, date_range
import pandas.util.testing as tm
from pandas.util.testing import (
assert_frame_equal, assert_panel_equal, assert_series_equal)

import pandas.io.formats.printing as printing

# ----------------------------------------------------------------------
# Generic types test cases


class Generic(object):

@property
Expand Down
4 changes: 3 additions & 1 deletion pandas/tests/generic/test_label_or_level_utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import pytest

from pandas.core.dtypes.missing import array_equivalent

import pandas as pd
import pandas.util.testing as tm
from pandas.core.dtypes.missing import array_equivalent


# Fixtures
Expand Down
8 changes: 4 additions & 4 deletions pandas/tests/generic/test_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

from warnings import catch_warnings, simplefilter

from pandas import Panel
from pandas.util.testing import (assert_panel_equal,
assert_almost_equal)
import pandas.util._test_decorators as td

from pandas import Panel
import pandas.util.testing as tm
import pandas.util._test_decorators as td
from pandas.util.testing import assert_almost_equal, assert_panel_equal

from .test_generic import Generic


Expand Down
15 changes: 7 additions & 8 deletions pandas/tests/generic/test_series.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
# -*- coding: utf-8 -*-
# pylint: disable-msg=E1101,W0612

from distutils.version import LooseVersion
from operator import methodcaller

import pytest
import numpy as np
import pandas as pd

from distutils.version import LooseVersion
from pandas import Series, date_range, MultiIndex
import pytest

from pandas.compat import range
from pandas.util.testing import (assert_series_equal,
assert_almost_equal)
import pandas.util._test_decorators as td

import pandas as pd
from pandas import MultiIndex, Series, date_range
import pandas.util.testing as tm
import pandas.util._test_decorators as td
from pandas.util.testing import assert_almost_equal, assert_series_equal

from .test_generic import Generic

try:
Expand Down
1 change: 1 addition & 0 deletions pandas/tests/tseries/offsets/conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pytest

import pandas.tseries.offsets as offsets


Expand Down
6 changes: 4 additions & 2 deletions pandas/tests/tseries/offsets/test_fiscal.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
from dateutil.relativedelta import relativedelta
import pytest

from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG

from pandas import Timestamp

from pandas.tseries.frequencies import get_offset
from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG
from pandas.tseries.offsets import FY5253Quarter, FY5253
from pandas.tseries.offsets import FY5253, FY5253Quarter

from .common import assert_offset_equal, assert_onOffset
from .test_offsets import Base, WeekDay
Expand Down
Loading