Move funtion imports

Author: phofl

pandas/core/array_algos/masked_reductions.py

@@ -8,7 +8,7 @@
 import numpy as np
 
 from pandas._libs import missing as libmissing
-from pandas.compat.numpy import np_version_under1p17
+from pandas.compat import np_version_under1p17
 
 from pandas.core.nanops import check_below_min_count
 

pandas/core/arrays/_mixins.py

@@ -7,7 +7,7 @@
 
 from pandas._libs import lib
 from pandas._typing import Shape
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.errors import AbstractMethodError
 from pandas.util._decorators import cache_readonly, doc
 from pandas.util._validators import validate_fillna_kwargs

pandas/core/arrays/base.py

@@ -26,8 +26,7 @@
 
 from pandas._libs import lib
 from pandas._typing import ArrayLike, Dtype, Shape
-from pandas.compat import set_function_name
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv, set_function_name
 from pandas.errors import AbstractMethodError
 from pandas.util._decorators import Appender, Substitution
 from pandas.util._validators import validate_fillna_kwargs

pandas/core/arrays/boolean.py

@@ -6,7 +6,7 @@
 
 from pandas._libs import lib, missing as libmissing
 from pandas._typing import ArrayLike, Dtype
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 
 from pandas.core.dtypes.common import (
     is_bool_dtype,

pandas/core/arrays/categorical.py

@@ -23,7 +23,7 @@
 from pandas._libs import NaT, algos as libalgos, hashtable as htable
 from pandas._libs.lib import no_default
 from pandas._typing import ArrayLike, Dtype, NpDtype, Ordered, Scalar
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.util._decorators import cache_readonly, deprecate_kwarg
 from pandas.util._validators import validate_bool_kwarg, validate_fillna_kwargs
 

pandas/core/arrays/datetimelike.py

@@ -37,7 +37,7 @@
     round_nsint64,
 )
 from pandas._typing import DatetimeLikeScalar, Dtype, DtypeObj, NpDtype
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.errors import AbstractMethodError, NullFrequencyError, PerformanceWarning
 from pandas.util._decorators import Appender, Substitution, cache_readonly
 

pandas/core/arrays/floating.py

@@ -6,7 +6,7 @@
 
 from pandas._libs import lib, missing as libmissing
 from pandas._typing import ArrayLike, DtypeObj
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.util._decorators import cache_readonly
 
 from pandas.core.dtypes.cast import astype_nansafe

pandas/core/arrays/integer.py

@@ -6,7 +6,7 @@
 
 from pandas._libs import iNaT, lib, missing as libmissing
 from pandas._typing import ArrayLike, Dtype, DtypeObj
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.util._decorators import cache_readonly
 
 from pandas.core.dtypes.base import ExtensionDtype, register_extension_dtype

pandas/core/arrays/interval.py

@@ -15,7 +15,7 @@
 )
 from pandas._libs.missing import NA
 from pandas._typing import ArrayLike, Dtype, NpDtype
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.util._decorators import Appender
 
 from pandas.core.dtypes.cast import maybe_convert_platform

pandas/core/arrays/numpy_.py

@@ -6,7 +6,7 @@
 
 from pandas._libs import lib
 from pandas._typing import Dtype, NpDtype, Scalar
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 
 from pandas.core.dtypes.dtypes import ExtensionDtype
 from pandas.core.dtypes.missing import isna

pandas/core/arrays/sparse/array.py

@@ -14,7 +14,7 @@
 from pandas._libs.sparse import BlockIndex, IntIndex, SparseIndex
 from pandas._libs.tslibs import NaT
 from pandas._typing import Dtype, NpDtype, Scalar
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.errors import PerformanceWarning
 
 from pandas.core.dtypes.cast import (

pandas/core/arrays/string_.py

@@ -4,7 +4,7 @@
 
 from pandas._libs import lib, missing as libmissing
 from pandas._typing import Dtype, Scalar
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 
 from pandas.core.dtypes.base import ExtensionDtype, register_extension_dtype
 from pandas.core.dtypes.common import (

pandas/core/arrays/timedeltas.py

@@ -23,7 +23,7 @@
     parse_timedelta_unit,
 )
 from pandas._typing import NpDtype
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 
 from pandas.core.dtypes.cast import astype_td64_unit_conversion
 from pandas.core.dtypes.common import (

pandas/core/base.py

@@ -20,8 +20,7 @@
 
 import pandas._libs.lib as lib
 from pandas._typing import Dtype, DtypeObj, IndexLabel
-from pandas.compat import PYPY
-from pandas.compat.numpy import function as nv
+from pandas.compat import PYPY, function as nv
 from pandas.errors import AbstractMethodError
 from pandas.util._decorators import cache_readonly, doc
 

pandas/core/common.py

@@ -15,7 +15,7 @@
 
 from pandas._libs import lib
 from pandas._typing import AnyArrayLike, NpDtype, Scalar, T
-from pandas.compat.numpy import np_version_under1p18
+from pandas.compat import np_version_under1p18
 
 from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
 from pandas.core.dtypes.common import (

pandas/core/frame.py

@@ -69,8 +69,8 @@
     Suffixes,
     ValueKeyFunc,
 )
+from pandas.compat import function as nv
 from pandas.compat._optional import import_optional_dependency
-from pandas.compat.numpy import function as nv
 from pandas.util._decorators import (
     Appender,
     Substitution,

pandas/core/generic.py

@@ -54,8 +54,8 @@
     ValueKeyFunc,
     final,
 )
+from pandas.compat import function as nv
 from pandas.compat._optional import import_optional_dependency
-from pandas.compat.numpy import function as nv
 from pandas.errors import AbstractMethodError, InvalidIndexError
 from pandas.util._decorators import doc, rewrite_axis_style_signature
 from pandas.util._validators import (

pandas/core/groupby/groupby.py

@@ -47,7 +47,7 @@ class providing the base-class of operations.
     Scalar,
     final,
 )
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.errors import AbstractMethodError
 from pandas.util._decorators import Appender, Substitution, cache_readonly, doc
 

pandas/core/indexes/base.py

@@ -29,7 +29,7 @@
 from pandas._libs.tslibs import IncompatibleFrequency, OutOfBoundsDatetime, Timestamp
 from pandas._libs.tslibs.timezones import tz_compare
 from pandas._typing import AnyArrayLike, ArrayLike, Dtype, DtypeObj, Label, Shape, final
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.errors import DuplicateLabelError, InvalidIndexError
 from pandas.util._decorators import Appender, cache_readonly, doc
 

pandas/core/indexes/datetimelike.py

@@ -9,7 +9,7 @@
 from pandas._libs import NaT, Timedelta, iNaT, join as libjoin, lib
 from pandas._libs.tslibs import BaseOffset, Resolution, Tick
 from pandas._typing import Callable, Label
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.util._decorators import Appender, cache_readonly, doc
 
 from pandas.core.dtypes.common import (

pandas/core/indexes/extension.py

@@ -7,7 +7,7 @@
 
 from pandas._libs import lib
 from pandas._typing import Label
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.errors import AbstractMethodError
 from pandas.util._decorators import cache_readonly, doc
 

pandas/core/indexes/multi.py

@@ -21,7 +21,7 @@
 from pandas._libs import algos as libalgos, index as libindex, lib
 from pandas._libs.hashtable import duplicated_int64
 from pandas._typing import AnyArrayLike, DtypeObj, Label, Scalar, Shape
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.errors import InvalidIndexError, PerformanceWarning, UnsortedIndexError
 from pandas.util._decorators import Appender, cache_readonly, doc
 

pandas/core/indexes/range.py

@@ -9,7 +9,7 @@
 from pandas._libs import index as libindex
 from pandas._libs.lib import no_default
 from pandas._typing import Dtype, Label
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.util._decorators import cache_readonly, doc
 
 from pandas.core.dtypes.common import (

pandas/core/resample.py

@@ -15,7 +15,7 @@
     to_offset,
 )
 from pandas._typing import TimedeltaConvertibleTypes, TimestampConvertibleTypes
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.errors import AbstractMethodError
 from pandas.util._decorators import Appender, Substitution, doc
 

pandas/core/series.py

@@ -37,7 +37,7 @@
     StorageOptions,
     ValueKeyFunc,
 )
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.errors import InvalidIndexError
 from pandas.util._decorators import Appender, Substitution, doc
 from pandas.util._validators import validate_bool_kwarg, validate_percentile

pandas/core/window/ewm.py

@@ -8,7 +8,7 @@
 from pandas._libs.tslibs import Timedelta
 import pandas._libs.window.aggregations as window_aggregations
 from pandas._typing import FrameOrSeries, TimedeltaConvertibleTypes
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.util._decorators import Appender, Substitution, doc
 
 from pandas.core.dtypes.common import is_datetime64_ns_dtype

pandas/core/window/expanding.py

@@ -4,7 +4,7 @@
 import numpy as np
 
 from pandas._typing import FrameOrSeries
-from pandas.compat.numpy import function as nv
+from pandas.compat import function as nv
 from pandas.util._decorators import Appender, Substitution, doc
 
 from pandas.core.window.common import _doc_template, _shared_docs

pandas/core/window/rolling.py

@@ -27,8 +27,8 @@
 from pandas._libs.tslibs import BaseOffset, to_offset
 import pandas._libs.window.aggregations as window_aggregations
 from pandas._typing import ArrayLike, Axis, FrameOrSeries, FrameOrSeriesUnion
+from pandas.compat import function as nv
 from pandas.compat._optional import import_optional_dependency
-from pandas.compat.numpy import function as nv
 from pandas.util._decorators import Appender, Substitution, doc
 
 from pandas.core.dtypes.common import (

pandas/tests/extension/base/dtype.py

@@ -73,7 +73,7 @@ def test_check_dtype(self, data):
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", DeprecationWarning)
             result = df.dtypes == str(dtype)
-            # NumPy>=1.20.0, but not pandas.compat.numpy till there
+            # NumPy>=1.20.0, but not pandas.compat till there
             # is a wheel available with this change.
             try:
                 new_numpy_behavior = np.dtype("int64") != "Int64"