8000 CLN: isort imports- util dir by alimcmaster1 · Pull Request #23331 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
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.

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 5 commits into from
Oct 30, 2018
Merged

CLN: isort imports- util dir #23331

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8394db1
isort util dir
alimcmaster1 Oct 26, 2018
866d30c
Remove pylint ignore warning
alimcmaster1 Oct 28, 2018
23a746e
Fix newline isort
alimcmaster1 Oct 28, 2018
833c1fe
Merge remote-tracking branch 'upstream/master' into isort-one
alimcmaster1 Oct 29, 2018
7baa169
New isort - fix imports
alimcmaster1 Oct 29, 2018
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
Prev Previous commit
New isort - fix imports
  • Loading branch information
@alimcmaster1
alimcmaster1 committed Oct 29, 2018
commit 7baa169f805ba2e2d6d5803bbb369ea0402128ae
7 changes: 4 additions & 3 deletions pandas/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
import os

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

import pandas as pd
import pandas.util._test_decorators as td
from pandas.compat import PY3
import pandas.util._test_decorators as td

import pandas as pd

hypothesis.settings.register_profile(
"ci",
Expand Down
3 changes: 1 addition & 2 deletions pandas/testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@
"""

from pandas.util.testing import (
assert_frame_equal, assert_index_equal, assert_series_equal
)
assert_frame_equal, assert_index_equal, assert_series_equal)
4 changes: 2 additions & 2 deletions pandas/util/_decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import inspect
import warnings
from functools import WRAPPER_ASSIGNMENTS, update_wrapper, wraps
import inspect
from textwrap import dedent, wrap
import warnings

from pandas._libs.properties import cache_readonly # noqa
from pandas.compat import PY2, callable, signature
Expand Down
3 changes: 2 additions & 1 deletion pandas/util/_doctools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import numpy as np

import pandas as pd
import pandas.compat as compat

import pandas as pd


class TablePlotter(object):
"""
Expand Down
9 changes: 4 additions & 5 deletions pandas/util/_test_decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,17 @@ def test_foo():

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

import pytest

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

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


def safe_import(mod_name, min_version=None):
Expand Down
34 changes: 17 additions & 17 deletions pandas/util/testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
from __future__ import division

from contextlib import contextmanager
from datetime import datetime
from functools import wraps
import locale
import os
import re
Expand All @@ -9,34 +12,31 @@
import tempfile
import traceback
import warnings
from contextlib import contextmanager
from datetime import datetime
from functools import wraps

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

import pandas as pd
import pandas.compat as compat
import pandas.core.common as com
from pandas import (
Categorical, CategoricalIndex, DataFrame, DatetimeIndex, Index,
IntervalIndex, MultiIndex, Panel, PeriodIndex, RangeIndex, Series,
TimedeltaIndex, bdate_range
)
from pandas._libs import testing as _testing
import pandas.compat as compat
from pandas.compat import (
PY2, PY3, Counter, StringIO, callable, filter, httplib, lmap, lrange, lzip,
map, raise_with_traceback, range, string_types, u, unichr, zip
)
from pandas.core.algorithms import take_1d
from pandas.core.arrays import ExtensionArray, IntervalArray, PeriodArray
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
)
is_list_like, is_number, is_sequence, needs_i8_conversion)
from pandas.core.dtypes.missing import array_equivalent

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.io.common import urlopen
from pandas.io.formats.printing import pprint_thing

Expand Down
0