Skip to content

CLN: isort imports- util dir #23331

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 5 commits into from
Oct 30, 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
1 change: 1 addition & 0 deletions pandas/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import re
import subprocess
import sys

from pandas.compat import PY3


Expand Down
13 changes: 6 additions & 7 deletions pandas/conftest.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import os
import importlib
import os

import hypothesis
from hypothesis import strategies as st
import numpy as np
import pytest

import pandas
import numpy as np
import pandas as pd
from pandas.compat import PY3
import pandas.util._test_decorators as td
import hypothesis

import pandas as pd

hypothesis.settings.register_profile(
"ci",
Expand Down Expand Up @@ -285,7 +285,7 @@ def deco(*args):
@pytest.fixture
def iris(datapath):
"""The iris dataset as a DataFrame."""
return pandas.read_csv(datapath('data', 'iris.csv'))
return pd.read_csv(datapath('data', 'iris.csv'))


@pytest.fixture(params=['nlargest', 'nsmallest'])
Expand Down Expand Up @@ -512,7 +512,6 @@ def mock():
# ----------------------------------------------------------------
# Global setup for tests using Hypothesis

from hypothesis import strategies as st

# Registering these strategies makes them globally available via st.from_type,
# which is use for offsets in tests/tseries/offsets/test_offsets_properties.py
Expand Down
2 changes: 1 addition & 1 deletion pandas/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
"""

from pandas.util.testing import (
assert_frame_equal, assert_series_equal, assert_index_equal)
assert_frame_equal, assert_index_equal, assert_series_equal)
9 changes: 5 additions & 4 deletions pandas/util/_decorators.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from pandas.compat import callable, signature, PY2
from pandas._libs.properties import cache_readonly # noqa
from functools import WRAPPER_ASSIGNMENTS, update_wrapper, wraps
import inspect
import warnings
from textwrap import dedent, wrap
from functools import wraps, update_wrapper, WRAPPER_ASSIGNMENTS
import warnings

from pandas._libs.properties import cache_readonly # noqa
from pandas.compat import PY2, callable, signature


def deprecate(name, alternative, version, alt_name=None,
Expand Down
2 changes: 1 addition & 1 deletion pandas/util/_depr_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
It is for internal use only and should not be used beyond this purpose.
"""

import warnings
import importlib
import warnings


class _DeprecatedModule(object):
Expand Down
4 changes: 3 additions & 1 deletion pandas/util/_doctools.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import numpy as np
import pandas as pd

import pandas.compat as compat

import pandas as pd


class TablePlotter(object):
"""
Expand Down
8 changes: 4 additions & 4 deletions pandas/util/_print_versions.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import codecs
import importlib
import locale
import os
import platform
import sys
import struct
import subprocess
import codecs
import locale
import importlib
import sys


def get_sys_info():
Expand Down
14 changes: 8 additions & 6 deletions pandas/util/_test_decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,17 @@ def test_foo():

For more information, refer to the ``pytest`` documentation on ``skipif``.
"""
import pytest
import locale
from distutils.version import LooseVersion
import locale

from pandas.compat import (is_platform_windows, is_platform_32bit, PY3,
import_lzma)
import pytest

from pandas.compat import (
PY3, import_lzma, is_platform_32bit, is_platform_windows)
from pandas.compat.numpy import _np_version_under1p15
from pandas.core.computation.expressions import (_USE_NUMEXPR,
_NUMEXPR_INSTALLED)

from pandas.core.computation.expressions import (
_NUMEXPR_INSTALLED, _USE_NUMEXPR)


def safe_import(mod_name, min_version=None):
Expand Down
65 changes: 26 additions & 39 deletions pandas/util/testing.py
Original file line number Diff line number Diff line change
@@ -1,57 +1,44 @@
from __future__ import division
# pylint: disable-msg=W0402

from contextlib import contextmanager
from datetime import datetime
from functools import wraps
import locale
import os
import re
import string
import subprocess
import sys
import tempfile
import warnings
import os
import subprocess
import locale
import traceback
import warnings

from datetime import datetime
from functools import wraps
from contextlib import contextmanager

from numpy.random import randn, rand
import numpy as np
from numpy.random import rand, randn

import pandas as pd
from pandas.core.arrays import (
ExtensionArray,
IntervalArray,
PeriodArray,
)
from pandas.core.dtypes.missing import array_equivalent
from pandas.core.dtypes.common import (
is_datetimelike_v_numeric,
is_datetimelike_v_object,
is_number, is_bool,
needs_i8_conversion,
is_categorical_dtype,
is_interval_dtype,
is_sequence,
is_list_like,
is_extension_array_dtype)
from pandas.io.formats.printing import pprint_thing
from pandas.core.algorithms import take_1d
import pandas.core.common as com

from pandas._libs import testing as _testing
import pandas.compat as compat
from pandas.compat import (
filter, map, zip, range, unichr, lrange, lmap, lzip, u, callable, Counter,
raise_with_traceback, httplib, StringIO, string_types, PY3, PY2)
PY2, PY3, Counter, StringIO, callable, filter, httplib, lmap, lrange, lzip,
map, raise_with_traceback, range, string_types, u, unichr, zip)

from pandas.core.dtypes.common import (
is_bool, is_categorical_dtype, is_datetimelike_v_numeric,
is_datetimelike_v_object, is_extension_array_dtype, is_interval_dtype,
is_list_like, is_number, is_sequence, needs_i8_conversion)
from pandas.core.dtypes.missing import array_equivalent

from pandas import (bdate_range, CategoricalIndex, Categorical, IntervalIndex,
DatetimeIndex, TimedeltaIndex, PeriodIndex, RangeIndex,
Index, MultiIndex,
Series, DataFrame, Panel)
import pandas as pd
from pandas import (
Categorical, CategoricalIndex, DataFrame, DatetimeIndex, Index,
IntervalIndex, MultiIndex, Panel, PeriodIndex, RangeIndex, Series,
TimedeltaIndex, bdate_range)
from pandas.core.algorithms import take_1d
from pandas.core.arrays import ExtensionArray, IntervalArray, PeriodArray
import pandas.core.common as com

from pandas._libs import testing as _testing
from pandas.io.common import urlopen

from pandas.io.formats.printing import pprint_thing

N = 30
K = 4
Expand Down
13 changes: 0 additions & 13 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,6 @@ force_grid_wrap=0
combine_as_imports=True
force_sort_within_sections=True
skip=
pandas/lib.py,
pandas/tslib.py,
pandas/testing.py,
pandas/conftest.py,
pandas/_version.py,
pandas/parser.py,
pandas/util/_depr_module.py,
pandas/util/testing.py,
pandas/util/_doctools.py,
pandas/util/decorators.py,
pandas/util/_print_versions.py,
pandas/util/_decorators.py,
pandas/util/_test_decorators.py,
pandas/io/sas/sas7bdat.py,
pandas/io/formats/console.py,
pandas/io/formats/excel.py,
Expand Down