Skip to content

Commit 26dc90a

Browse files
Dr-IrvDr-Irv
committed
Merge remote-tracking branch 'upstream/master' into sparsedepr
2 parents c31afa1 + ba58ead commit 26dc90a

36 files changed

+157
-187
lines changed

‎doc/source/reference/general_utility_functions.rst‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,7 @@ Testing functions
2828
testing.assert_frame_equal
2929
testing.assert_series_equal
3030
testing.assert_index_equal
31-
testing.assert_equal
32-
testing.assert_almost_equal
33-
testing.assert_categorical_equal
34-
testing.assert_datetime_array_equal
3531
testing.assert_extension_array_equal
36-
testing.assert_interval_array_equal
37-
testing.assert_numpy_array_equal
38-
testing.assert_period_array_equal
39-
testing.assert_sp_array_equal
40-
testing.assert_timedelta_array_equal
4132

4233
Exceptions and warnings
4334
-----------------------

‎pandas/api/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
""" public toolkit API """
2-
from . import extensions, indexers, types # noqa
2+
from pandas.api import extensions, indexers, types # noqa

‎pandas/core/arrays/__init__.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
from .base import ( # noqa: F401
1+
from pandas.core.arrays.base import ( # noqa: F401
22
ExtensionArray,
33
ExtensionOpsMixin,
44
ExtensionScalarOpsMixin,
55
try_cast_to_ea,
66
)
7-
from .boolean import BooleanArray # noqa: F401
8-
from .categorical import Categorical # noqa: F401
9-
from .datetimes import DatetimeArray # noqa: F401
10-
from .integer import IntegerArray, integer_array # noqa: F401
11-
from .interval import IntervalArray # noqa: F401
12-
from .numpy_ import PandasArray, PandasDtype # noqa: F401
13-
from .period import PeriodArray, period_array # noqa: F401
14-
from .sparse import SparseArray # noqa: F401
15-
from .string_ import StringArray # noqa: F401
16-
from .timedeltas import TimedeltaArray # noqa: F401
7+
from pandas.core.arrays.boolean import BooleanArray # noqa: F401
8+
from pandas.core.arrays.categorical import Categorical # noqa: F401
9+
from pandas.core.arrays.datetimes import DatetimeArray # noqa: F401
10+
from pandas.core.arrays.integer import IntegerArray, integer_array # noqa: F401
11+
from pandas.core.arrays.interval import IntervalArray # noqa: F401
12+
from pandas.core.arrays.numpy_ import PandasArray, PandasDtype # noqa: F401
13+
from pandas.core.arrays.period import PeriodArray, period_array # noqa: F401
14+
from pandas.core.arrays.sparse import SparseArray # noqa: F401
15+
from pandas.core.arrays.string_ import StringArray # noqa: F401
16+
from pandas.core.arrays.timedeltas import TimedeltaArray # noqa: F401

‎pandas/core/arrays/categorical.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
from pandas.core.accessor import PandasDelegate, delegate_names
4747
import pandas.core.algorithms as algorithms
4848
from pandas.core.algorithms import _get_data_algo, factorize, take, take_1d, unique1d
49+
from pandas.core.arrays.base import (
50+
ExtensionArray,
51+
_extension_array_shared_docs,
52+
try_cast_to_ea,
53+
)
4954
from pandas.core.base import NoNewAttributesMixin, PandasObject, _shared_docs
5055
import pandas.core.common as com
5156
from pandas.core.construction import array, extract_array, sanitize_array
@@ -56,8 +61,6 @@
5661

5762
from pandas.io.formats import console
5863

59-
from .base import ExtensionArray, _extension_array_shared_docs, try_cast_to_ea
60-
6164

6265
def _cat_compare_op(op):
6366
opname = f"__{op.__name__}__"

‎pandas/core/arrays/datetimelike.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141
from pandas.core import missing, nanops, ops
4242
from pandas.core.algorithms import checked_add_with_arr, take, unique1d, value_counts
43+
from pandas.core.arrays.base import ExtensionArray, ExtensionOpsMixin
4344
import pandas.core.common as com
4445
from pandas.core.indexers import check_bool_array_indexer
4546
from pandas.core.ops.common import unpack_zerodim_and_defer
@@ -48,8 +49,6 @@
4849
from pandas.tseries import frequencies
4950
from pandas.tseries.offsets import DateOffset, Tick
5051

51-
from .base import ExtensionArray, ExtensionOpsMixin
52-
5352

5453
def _datetimelike_array_cmp(cls, op):
5554
"""

‎pandas/core/arrays/numpy_.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
from pandas import compat
1818
from pandas.core import nanops
1919
from pandas.core.algorithms import searchsorted, take, unique
20+
from pandas.core.arrays.base import ExtensionArray, ExtensionOpsMixin
2021
import pandas.core.common as com
2122
from pandas.core.construction import extract_array
2223
from pandas.core.indexers import check_bool_array_indexer
2324
from pandas.core.missing import backfill_1d, pad_1d
2425

25-
from .base import ExtensionArray, ExtensionOpsMixin
26-
2726

2827
class PandasDtype(ExtensionDtype):
2928
"""

‎pandas/core/arrays/sparse/__init__.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# flake8: noqa: F401
22

3-
from .accessor import SparseAccessor, SparseFrameAccessor
4-
from .array import BlockIndex, IntIndex, SparseArray, _make_index
5-
from .dtype import SparseDtype
3+
from pandas.core.arrays.sparse.accessor import SparseAccessor, SparseFrameAccessor
4+
from pandas.core.arrays.sparse.array import (
5+
BlockIndex,
6+
IntIndex,
7+
SparseArray,
8+
_make_index,
9+
)
10+
from pandas.core.arrays.sparse.dtype import SparseDtype

‎pandas/core/arrays/sparse/accessor.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
from pandas.core.dtypes.cast import find_common_type
88

99
from pandas.core.accessor import PandasDelegate, delegate_names
10-
11-
from .array import SparseArray
12-
from .dtype import SparseDtype
10+
from pandas.core.arrays.sparse.array import SparseArray
11+
from pandas.core.arrays.sparse.dtype import SparseDtype
1312

1413

1514
class BaseAccessor:

‎pandas/core/arrays/sparse/array.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import pandas.core.algorithms as algos
4141
from pandas.core.arrays import ExtensionArray, ExtensionOpsMixin
42+
from pandas.core.arrays.sparse.dtype import SparseDtype
4243
from pandas.core.base import PandasObject
4344
import pandas.core.common as com
4445
from pandas.core.construction import sanitize_array
@@ -48,8 +49,6 @@
4849

4950
import pandas.io.formats.printing as printing
5051

51-
from .dtype import SparseDtype
52-
5352
# ----------------------------------------------------------------------------
5453
# Array
5554

‎pandas/core/arrays/sparse/dtype.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def construct_array_type(cls):
175175
-------
176176
type
177177
"""
178-
from .array import SparseArray
178+
from pandas.core.arrays.sparse.array import SparseArray
179179

180180
return SparseArray
181181

0 commit comments

Comments
 (0)