Skip to content

Commit da9e358

Browse files
alimcmaster1jreback
authored andcommitted
CLN: isort imports- util dir (#23331)
1 parent ea17df5 commit da9e358

10 files changed

+55
-76
lines changed

pandas/_version.py

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import re
1313
import subprocess
1414
import sys
15+
1516
from pandas.compat import PY3
1617

1718

pandas/conftest.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import os
21
import importlib
2+
import os
33

4+
import hypothesis
5+
from hypothesis import strategies as st
6+
import numpy as np
47
import pytest
58

6-
import pandas
7-
import numpy as np
8-
import pandas as pd
99
from pandas.compat import PY3
1010
import pandas.util._test_decorators as td
11-
import hypothesis
1211

12+
import pandas as pd
1313

1414
hypothesis.settings.register_profile(
1515
"ci",
@@ -285,7 +285,7 @@ def deco(*args):
285285
@pytest.fixture
286286
def iris(datapath):
287287
"""The iris dataset as a DataFrame."""
288-
return pandas.read_csv(datapath('data', 'iris.csv'))
288+
return pd.read_csv(datapath('data', 'iris.csv'))
289289

290290

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

515-
from hypothesis import strategies as st
516515

517516
# Registering these strategies makes them globally available via st.from_type,
518517
# which is use for offsets in tests/tseries/offsets/test_offsets_properties.py

pandas/testing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
"""
66

77
from pandas.util.testing import (
8-
assert_frame_equal, assert_series_equal, assert_index_equal)
8+
assert_frame_equal, assert_index_equal, assert_series_equal)

pandas/util/_decorators.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
from pandas.compat import callable, signature, PY2
2-
from pandas._libs.properties import cache_readonly # noqa
1+
from functools import WRAPPER_ASSIGNMENTS, update_wrapper, wraps
32
import inspect
4-
import warnings
53
from textwrap import dedent, wrap
6-
from functools import wraps, update_wrapper, WRAPPER_ASSIGNMENTS
4+
import warnings
5+
6+
from pandas._libs.properties import cache_readonly # noqa
7+
from pandas.compat import PY2, callable, signature
78

89

910
def deprecate(name, alternative, version, alt_name=None,

pandas/util/_depr_module.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
It is for internal use only and should not be used beyond this purpose.
44
"""
55

6-
import warnings
76
import importlib
7+
import warnings
88

99

1010
class _DeprecatedModule(object):

pandas/util/_doctools.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import numpy as np
2-
import pandas as pd
2+
33
import pandas.compat as compat
44

5+
import pandas as pd
6+
57

68
class TablePlotter(object):
79
"""

pandas/util/_print_versions.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import codecs
2+
import importlib
3+
import locale
14
import os
25
import platform
3-
import sys
46
import struct
57
import subprocess
6-
import codecs
7-
import locale
8-
import importlib
8+
import sys
99

1010

1111
def get_sys_info():

pandas/util/_test_decorators.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@ def test_foo():
2323
2424
For more information, refer to the ``pytest`` documentation on ``skipif``.
2525
"""
26-
import pytest
27-
import locale
2826
from distutils.version import LooseVersion
27+
import locale
2928

30-
from pandas.compat import (is_platform_windows, is_platform_32bit, PY3,
31-
import_lzma)
29+
import pytest
30+
31+
from pandas.compat import (
32+
PY3, import_lzma, is_platform_32bit, is_platform_windows)
3233
from pandas.compat.numpy import _np_version_under1p15
33-
from pandas.core.computation.expressions import (_USE_NUMEXPR,
34-
_NUMEXPR_INSTALLED)
34+
35+
from pandas.core.computation.expressions import (
36+
_NUMEXPR_INSTALLED, _USE_NUMEXPR)
3537

3638

3739
def safe_import(mod_name, min_version=None):

pandas/util/testing.py

+26-39
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,44 @@
11
from __future__ import division
2-
# pylint: disable-msg=W0402
32

3+
from contextlib import contextmanager
4+
from datetime import datetime
5+
from functools import wraps
6+
import locale
7+
import os
48
import re
59
import string
10+
import subprocess
611
import sys
712
import tempfile
8-
import warnings
9-
import os
10-
import subprocess
11-
import locale
1213
import traceback
14+
import warnings
1315

14-
from datetime import datetime
15-
from functools import wraps
16-
from contextlib import contextmanager
17-
18-
from numpy.random import randn, rand
1916
import numpy as np
17+
from numpy.random import rand, randn
2018

21-
import pandas as pd
22-
from pandas.core.arrays import (
23-
ExtensionArray,
24-
IntervalArray,
25-
PeriodArray,
26-
)
27-
from pandas.core.dtypes.missing import array_equivalent
28-
from pandas.core.dtypes.common import (
29-
is_datetimelike_v_numeric,
30-
is_datetimelike_v_object,
31-
is_number, is_bool,
32-
needs_i8_conversion,
33-
is_categorical_dtype,
34-
is_interval_dtype,
35-
is_sequence,
36-
is_list_like,
37-
is_extension_array_dtype)
38-
from pandas.io.formats.printing import pprint_thing
39-
from pandas.core.algorithms import take_1d
40-
import pandas.core.common as com
41-
19+
from pandas._libs import testing as _testing
4220
import pandas.compat as compat
4321
from pandas.compat import (
44-
filter, map, zip, range, unichr, lrange, lmap, lzip, u, callable, Counter,
45-
raise_with_traceback, httplib, StringIO, string_types, PY3, PY2)
22+
PY2, PY3, Counter, StringIO, callable, filter, httplib, lmap, lrange, lzip,
23+
map, raise_with_traceback, range, string_types, u, unichr, zip)
24+
25+
from pandas.core.dtypes.common import (
26+
is_bool, is_categorical_dtype, is_datetimelike_v_numeric,
27+
is_datetimelike_v_object, is_extension_array_dtype, is_interval_dtype,
28+
is_list_like, is_number, is_sequence, needs_i8_conversion)
29+
from pandas.core.dtypes.missing import array_equivalent
4630

47-
from pandas import (bdate_range, CategoricalIndex, Categorical, IntervalIndex,
48-
DatetimeIndex, TimedeltaIndex, PeriodIndex, RangeIndex,
49-
Index, MultiIndex,
50-
Series, DataFrame, Panel)
31+
import pandas as pd
32+
from pandas import (
33+
Categorical, CategoricalIndex, DataFrame, DatetimeIndex, Index,
34+
IntervalIndex, MultiIndex, Panel, PeriodIndex, RangeIndex, Series,
35+
TimedeltaIndex, bdate_range)
36+
from pandas.core.algorithms import take_1d
37+
from pandas.core.arrays import ExtensionArray, IntervalArray, PeriodArray
38+
import pandas.core.common as com
5139

52-
from pandas._libs import testing as _testing
5340
from pandas.io.common import urlopen
54-
41+
from pandas.io.formats.printing import pprint_thing
5542

5643
N = 30
5744
K = 4

setup.cfg

-13
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,6 @@ force_grid_wrap=0
8989
combine_as_imports=True
9090
force_sort_within_sections=True
9191
skip=
92-
pandas/lib.py,
93-
pandas/tslib.py,
94-
pandas/testing.py,
95-
pandas/conftest.py,
96-
pandas/_version.py,
97-
pandas/parser.py,
98-
pandas/util/_depr_module.py,
99-
pandas/util/testing.py,
100-
pandas/util/_doctools.py,
101-
pandas/util/decorators.py,
102-
pandas/util/_print_versions.py,
103-
pandas/util/_decorators.py,
104-
pandas/util/_test_decorators.py,
10592
pandas/io/sas/sas7bdat.py,
10693
pandas/io/formats/console.py,
10794
pandas/io/formats/excel.py,

0 commit comments

Comments
 (0)