pandas._sparse -> pandas.sparse.libsparse

Author: jreback

doc/source/whatsnew/v0.20.0.txt

@@ -463,6 +463,7 @@ If indicated, a deprecation warning will be issued if you reference that module.
     "pandas.io.sas.saslib", "pandas.io.sas.libsas", ""
     "pandas.msgpack", "pandas.io.msgpack", ""
     "pandas._testing", "pandas.util.libtesting", ""
+    "pandas._sparse", "pandas.sparse.libsparse", ""
 
 
 .. _whatsnew_0200.api_breaking.groupby_describe:

pandas/compat/pickle_compat.py

@@ -61,7 +61,10 @@ def load_reduce(self):
     ('pandas.core.base', 'FrozenList'): ('pandas.indexes.frozen', 'FrozenList'),
 
     # 10890
-    ('pandas.core.series', 'TimeSeries'): ('pandas.core.series', 'Series')
+    ('pandas.core.series', 'TimeSeries'): ('pandas.core.series', 'Series'),
+
+    # 12588, extensions moving
+    ('pandas._sparse', 'BlockIndex'): ('pandas.sparse.libsparse', 'BlockIndex')
     }
 
 

pandas/core/reshape.py

@@ -17,7 +17,7 @@
 
 from pandas.core.sparse import SparseDataFrame, SparseSeries
 from pandas.sparse.array import SparseArray
-from pandas._sparse import IntIndex
+from pandas.sparse.libsparse import IntIndex
 
 from pandas.core.categorical import Categorical, _factorize_from_iterable
 from pandas.core.sorting import (get_group_index, compress_group_index,

pandas/sparse/array.py

@@ -25,8 +25,8 @@
                                _astype_nansafe, _find_common_type)
 from pandas.types.missing import isnull, notnull, na_value_for_dtype
 
-from pandas._sparse import SparseIndex, BlockIndex, IntIndex
-import pandas._sparse as splib
+from pandas.sparse import libsparse as splib
+from pandas.sparse.libsparse import SparseIndex, BlockIndex, IntIndex
 import pandas.index as _index
 import pandas.core.algorithms as algos
 import pandas.core.ops as ops

pandas/sparse/list.py

@@ -6,7 +6,7 @@
 from pandas.types.common import is_scalar
 from pandas.sparse.array import SparseArray
 from pandas.util.validators import validate_bool_kwarg
-import pandas._sparse as splib
+import pandas.sparse.libsparse as splib
 
 
 class SparseList(PandasObject):

pandas/sparse/series.py

@@ -25,8 +25,8 @@
 
 from pandas.sparse.array import (make_sparse, _sparse_array_op, SparseArray,
                                  _make_index)
-from pandas._sparse import BlockIndex, IntIndex
-import pandas._sparse as splib
+from pandas.sparse.libsparse import BlockIndex, IntIndex
+import pandas.sparse.libsparse as splib
 
 from pandas.sparse.scipy_sparse import (_sparse_series_to_coo,
                                         _coo_to_sparse_series)

pandas/src/sparse.pyx renamed to pandas/sparse/sparse.pyx

@@ -8,7 +8,7 @@
 
 from pandas import _np_version_under1p8
 from pandas.sparse.api import SparseArray, SparseSeries
-from pandas._sparse import IntIndex
+from pandas.sparse.libsparse import IntIndex
 from pandas.util.testing import assert_almost_equal, assertRaisesRegexp
 import pandas.util.testing as tm
 

pandas/src/sparse_op_helper.pxi.in renamed to pandas/sparse/sparse_op_helper.pxi.in

@@ -14,7 +14,7 @@
 from pandas import compat
 import pandas.sparse.frame as spf
 
-from pandas._sparse import BlockIndex, IntIndex
+from pandas.sparse.libsparse import BlockIndex, IntIndex
 from pandas.sparse.api import SparseSeries, SparseDataFrame, SparseArray
 from pandas.tests.frame.test_misc_api import SharedWithSparse
 

pandas/tests/sparse/test_array.py

@@ -8,7 +8,7 @@
 from pandas import compat
 
 from pandas.sparse.array import IntIndex, BlockIndex, _make_index
-import pandas._sparse as splib
+import pandas.sparse.libsparse as splib
 
 TEST_LENGTH = 20
 

pandas/tests/sparse/test_frame.py

@@ -16,7 +16,7 @@
 
 import pandas.sparse.frame as spf
 
-from pandas._sparse import BlockIndex, IntIndex
+from pandas.sparse.libsparse import BlockIndex, IntIndex
 from pandas.sparse.api import SparseSeries
 from pandas.tests.series.test_misc_api import SharedWithSparse
 

pandas/tests/sparse/test_libsparse.py

@@ -1413,8 +1413,10 @@ def assert_sp_array_equal(left, right, check_dtype=True):
                              check_dtype=check_dtype)
 
     # SparseIndex comparison
-    assertIsInstance(left.sp_index, pd._sparse.SparseIndex, '[SparseIndex]')
-    assertIsInstance(right.sp_index, pd._sparse.SparseIndex, '[SparseIndex]')
+    assertIsInstance(left.sp_index,
+                     pd.sparse.libsparse.SparseIndex, '[SparseIndex]')
+    assertIsInstance(right.sp_index,
+                     pd.sparse.libsparse.SparseIndex, '[SparseIndex]')
 
     if not left.sp_index.equals(right.sp_index):
         raise_assert_detail('SparseArray.index', 'index are not equal',

pandas/tests/sparse/test_series.py

@@ -109,20 +109,20 @@ def is_platform_mac():
 from os.path import join as pjoin
 
 
-_pxipath = pjoin('pandas', 'src')
 _pxi_dep_template = {
-    'algos': ['algos_common_helper.pxi.in', 'algos_groupby_helper.pxi.in',
-              'algos_take_helper.pxi.in', 'algos_rank_helper.pxi.in'],
-    '_join': ['join_helper.pxi.in', 'joins_func_helper.pxi.in'],
-    'hashtable': ['hashtable_class_helper.pxi.in',
-                  'hashtable_func_helper.pxi.in'],
-    'index': ['index_class_helper.pxi.in'],
-    '_sparse': ['sparse_op_helper.pxi.in']
+    'algos': ['src/algos_common_helper.pxi.in', 'src/algos_groupby_helper.pxi.in',
+               'src/algos_take_helper.pxi.in', 'src/algos_rank_helper.pxi.in'],
+    'join': ['src/join_helper.pxi.in', 'src/joins_func_helper.pxi.in'],
+    'hashtable': ['src/hashtable_class_helper.pxi.in',
+                   'src/hashtable_func_helper.pxi.in'],
+    'index': ['src/index_class_helper.pxi.in'],
+    'sparse': ['sparse/sparse_op_helper.pxi.in'],
 }
+
 _pxifiles = []
 _pxi_dep = {}
 for module, files in _pxi_dep_template.items():
-    pxi_files = [pjoin(_pxipath, x) for x in files]
+    pxi_files = [pjoin('pandas', x) for x in files]
     _pxifiles.extend(pxi_files)
     _pxi_dep[module] = pxi_files
 
@@ -335,7 +335,7 @@ class CheckSDist(sdist_class):
                  'pandas/window.pyx',
                  'pandas/io/parsers.pyx',
                  'pandas/src/period.pyx',
-                 'pandas/src/sparse.pyx',
+                 'pandas/sparse/sparse.pyx',
                  'pandas/util/testing.pyx',
                  'pandas/src/hash.pyx',
                  'pandas/io/sas/sas.pyx']
@@ -498,7 +498,7 @@ def pxd(name):
               'depends': _pxi_dep['algos']},
     '_join': {'pyxfile': 'src/join',
               'pxdfiles': ['src/util', 'hashtable'],
-              'depends': _pxi_dep['_join']},
+              'depends': _pxi_dep['join']},
     '_window': {'pyxfile': 'window',
                 'pxdfiles': ['src/skiplist', 'src/util'],
                 'depends': ['pandas/src/skiplist.pyx',
@@ -509,9 +509,9 @@ def pxd(name):
                                  'pandas/src/numpy_helper.h'],
                      'sources': ['pandas/src/parser/tokenizer.c',
                                  'pandas/src/parser/io.c']},
-    '_sparse': {'pyxfile': 'src/sparse',
-                'depends': ([srcpath('sparse', suffix='.pyx')] +
-                            _pxi_dep['sparse'])},
+    'sparse.libsparse': {'pyxfile': 'sparse/sparse',
+                         'depends': (['pandas/sparse/sparse.pyx'] +
+                                     _pxi_dep['sparse'])},
     'util.libtesting': {'pyxfile': 'util/testing',
                         'depends': ['pandas/util/testing.pyx']},
     '_hash': {'pyxfile': 'src/hash',