CLN: move pandas.indexes -> pandas.core.indexes

doc/source/whatsnew/v0.20.0.txt

@@ -1344,6 +1344,7 @@ If indicated, a deprecation warning will be issued if you reference theses modul
     "pandas.index", "pandas._libs.index", ""
     "pandas.algos", "pandas._libs.algos", ""
     "pandas.hashtable", "pandas._libs.hashtable", ""
+    "pandas.indexes", "pandas.core.indexes", ""
     "pandas.json", "pandas.io.json.libjson", "X"
     "pandas.parser", "pandas.io.libparsers", "X"
     "pandas.formats", "pandas.io.formats", ""

pandas/compat/pickle_compat.py

@@ -59,9 +59,9 @@ def load_reduce(self):
 
     # 15477
     ('pandas.core.base', 'FrozenNDArray'):
-        ('pandas.indexes.frozen', 'FrozenNDArray'),
+        ('pandas.core.indexes.frozen', 'FrozenNDArray'),
     ('pandas.core.base', 'FrozenList'):
-        ('pandas.indexes.frozen', 'FrozenList'),
+        ('pandas.core.indexes.frozen', 'FrozenList'),
 
     # 10890
     ('pandas.core.series', 'TimeSeries'):
@@ -84,7 +84,17 @@ def load_reduce(self):
     ('pandas.sparse.series', 'SparseSeries'):
         ('pandas.core.sparse.series', 'SparseSeries'),
     ('pandas.sparse.frame', 'SparseDataFrame'):
-        ('pandas.core.sparse.frame', 'SparseDataFrame')
+        ('pandas.core.sparse.frame', 'SparseDataFrame'),
+    ('pandas.indexes.base', '_new_Index'):
+        ('pandas.core.indexes.base', '_new_Index'),
+    ('pandas.indexes.base', 'Index'):
+        ('pandas.core.indexes.base', 'Index'),
+    ('pandas.indexes.numeric', 'Int64Index'):
+        ('pandas.core.indexes.numeric', 'Int64Index'),
+    ('pandas.indexes.range', 'RangeIndex'):
+        ('pandas.core.indexes.range', 'RangeIndex'),
+    ('pandas.indexes.multi', 'MultiIndex'):
+        ('pandas.core.indexes.multi', 'MultiIndex')
 }
 
 

pandas/core/api.py

@@ -12,7 +12,7 @@
 from pandas.core.index import (Index, CategoricalIndex, Int64Index,
                                UInt64Index, RangeIndex, Float64Index,
                                MultiIndex, IntervalIndex)
-from pandas.indexes.interval import Interval, interval_range
+from pandas.core.indexes.interval import Interval, interval_range
 
 from pandas.core.series import Series
 from pandas.core.frame import DataFrame

pandas/core/categorical.py

@@ -2128,7 +2128,7 @@ def _factorize_from_iterable(values):
         If `values` has a categorical dtype, then `categories` is
         a CategoricalIndex keeping the categories and order of `values`.
     """
-    from pandas.indexes.category import CategoricalIndex
+    from pandas.core.indexes.category import CategoricalIndex
 
     if not is_list_like(values):
         raise TypeError("Input must be list-like")

pandas/core/index.py

@@ -1,3 +1,3 @@
 # flake8: noqa
-from pandas.indexes.api import *
-from pandas.indexes.multi import _sparsify
+from pandas.core.indexes.api import *
+from pandas.core.indexes.multi import _sparsify

pandas/indexes/api.py → pandas/core/indexes/api.py

@@ -1,12 +1,12 @@
-from pandas.indexes.base import (Index, _new_Index,  # noqa
+from pandas.core.indexes.base import (Index, _new_Index,  # noqa
                                  _ensure_index, _get_na_value,
                                  InvalidIndexError)
-from pandas.indexes.category import CategoricalIndex  # noqa
-from pandas.indexes.multi import MultiIndex  # noqa
-from pandas.indexes.interval import IntervalIndex  # noqa
-from pandas.indexes.numeric import (NumericIndex, Float64Index,  # noqa
+from pandas.core.indexes.category import CategoricalIndex  # noqa
+from pandas.core.indexes.multi import MultiIndex  # noqa
+from pandas.core.indexes.interval import IntervalIndex  # noqa
+from pandas.core.indexes.numeric import (NumericIndex, Float64Index,  # noqa
                                     Int64Index, UInt64Index)
-from pandas.indexes.range import RangeIndex  # noqa
+from pandas.core.indexes.range import RangeIndex  # noqa
 
 import pandas.core.common as com
 import pandas._libs.lib as lib

pandas/indexes/base.py → pandas/core/indexes/base.py

@@ -43,7 +43,7 @@
 import pandas.core.base as base
 from pandas.util.decorators import (Appender, Substitution, cache_readonly,
                                     deprecate, deprecate_kwarg)
-from pandas.indexes.frozen import FrozenList
+from pandas.core.indexes.frozen import FrozenList
 import pandas.core.common as com
 import pandas.core.dtypes.concat as _concat
 import pandas.core.missing as missing
@@ -1675,7 +1675,7 @@ def append(self, other):
 
         if self.is_categorical():
             # if calling index is category, don't check dtype of others
-            from pandas.indexes.category import CategoricalIndex
+            from pandas.core.indexes.category import CategoricalIndex
             return CategoricalIndex._append_same_dtype(self, to_concat, name)
 
         typs = _concat.get_dtype_kinds(to_concat)

pandas/indexes/category.py → pandas/core/indexes/category.py

@@ -16,10 +16,10 @@
 
 from pandas.util.decorators import Appender, cache_readonly
 from pandas.core.config import get_option
-from pandas.indexes.base import Index, _index_shared_docs
+from pandas.core.indexes.base import Index, _index_shared_docs
 import pandas.core.base as base
 import pandas.core.missing as missing
-import pandas.indexes.base as ibase
+import pandas.core.indexes.base as ibase
 
 _index_doc_kwargs = dict(ibase._index_doc_kwargs)
 _index_doc_kwargs.update(dict(target_klass='CategoricalIndex'))

pandas/indexes/interval.py → pandas/core/indexes/interval.py

@@ -16,20 +16,22 @@
     is_interval_dtype,
     is_scalar,
     is_integer)
-from pandas.indexes.base import (Index, _ensure_index,
-                                 default_pprint, _index_shared_docs)
+from pandas.core.indexes.base import (
+    Index, _ensure_index,
+    default_pprint, _index_shared_docs)
 
 from pandas._libs import Timestamp, Timedelta
-from pandas._libs.interval import (Interval, IntervalMixin, IntervalTree,
-                                   intervals_to_interval_bounds)
+from pandas._libs.interval import (
+    Interval, IntervalMixin, IntervalTree,
+    intervals_to_interval_bounds)
 
-from pandas.indexes.multi import MultiIndex
+from pandas.core.indexes.multi import MultiIndex
 from pandas.compat.numpy import function as nv
 from pandas.core import common as com
 from pandas.util.decorators import cache_readonly, Appender
 from pandas.core.config import get_option
 
-import pandas.indexes.base as ibase
+import pandas.core.indexes.base as ibase
 _index_doc_kwargs = dict(ibase._index_doc_kwargs)
 _index_doc_kwargs.update(
     dict(klass='IntervalIndex',

pandas/indexes/multi.py → pandas/core/indexes/multi.py

@@ -35,11 +35,13 @@
 
 from pandas.core.config import get_option
 
-from pandas.indexes.base import (Index, _ensure_index,
-                                 _get_na_value, InvalidIndexError,
-                                 _index_shared_docs)
-from pandas.indexes.frozen import FrozenNDArray, FrozenList, _ensure_frozen
-import pandas.indexes.base as ibase
+from pandas.core.indexes.base import (
+    Index, _ensure_index,
+    _get_na_value, InvalidIndexError,
+    _index_shared_docs)
+from pandas.core.indexes.frozen import (
+    FrozenNDArray, FrozenList, _ensure_frozen)
+import pandas.core.indexes.base as ibase
 _index_doc_kwargs = dict(ibase._index_doc_kwargs)
 _index_doc_kwargs.update(
     dict(klass='MultiIndex',

pandas/indexes/numeric.py → pandas/core/indexes/numeric.py

@@ -9,9 +9,10 @@
 
 from pandas import compat
 from pandas.core import algorithms
-from pandas.indexes.base import Index, InvalidIndexError, _index_shared_docs
+from pandas.core.indexes.base import (
+    Index, InvalidIndexError, _index_shared_docs)
 from pandas.util.decorators import Appender, cache_readonly
-import pandas.indexes.base as ibase
+import pandas.core.indexes.base as ibase
 
 
 _num_index_shared_docs = dict()

pandas/indexes/range.py → pandas/core/indexes/range.py

@@ -12,11 +12,11 @@
 from pandas import compat
 from pandas.compat import lrange, range
 from pandas.compat.numpy import function as nv
-from pandas.indexes.base import Index, _index_shared_docs
+from pandas.core.indexes.base import Index, _index_shared_docs
 from pandas.util.decorators import Appender, cache_readonly
-import pandas.indexes.base as ibase
+import pandas.core.indexes.base as ibase
 
-from pandas.indexes.numeric import Int64Index
+from pandas.core.indexes.numeric import Int64Index
 
 
 class RangeIndex(Int64Index):

pandas/core/sparse/array.py

@@ -36,7 +36,7 @@
 import pandas.core.ops as ops
 import pandas.io.formats.printing as printing
 from pandas.util.decorators import Appender
-from pandas.indexes.base import _index_shared_docs
+from pandas.core.indexes.base import _index_shared_docs
 
 
 _sparray_doc_kwargs = dict(klass='SparseArray')

pandas/tests/api/test_api.py

@@ -30,8 +30,7 @@ class TestPDApi(Base, tm.TestCase):
     ignored = ['tests', 'locale', 'conftest']
 
     # top-level sub-packages
-    lib = ['api', 'compat', 'core',
-           'indexes', 'errors', 'pandas',
+    lib = ['api', 'compat', 'core', 'errors', 'pandas',
            'plotting', 'test', 'testing', 'tools', 'tseries',
            'util', 'options', 'io']
 

pandas/tests/indexes/common.py

@@ -419,7 +419,7 @@ def test_numpy_argsort(self):
             # pandas compatibility input validation - the
             # rest already perform separate (or no) such
             # validation via their 'values' attribute as
-            # defined in pandas.indexes/base.py - they
+            # defined in pandas.core.indexes/base.py - they
             # cannot be changed at the moment due to
             # backwards compatibility concerns
             if isinstance(type(ind), (CategoricalIndex, RangeIndex)):

pandas/tests/indexes/test_base.py

@@ -3,7 +3,7 @@
 from datetime import datetime, timedelta
 
 import pandas.util.testing as tm
-from pandas.indexes.api import Index, MultiIndex
+from pandas.core.indexes.api import Index, MultiIndex
 from pandas.tests.indexes.common import Base
 
 from pandas.compat import (range, lrange, lzip, u,

pandas/tests/indexes/test_category.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pandas.util.testing as tm
-from pandas.indexes.api import Index, CategoricalIndex
+from pandas.core.indexes.api import Index, CategoricalIndex
 from .common import Base
 
 from pandas.compat import range, PY3

pandas/tests/indexes/test_frozen.py

@@ -1,7 +1,7 @@
 import numpy as np
 from pandas.util import testing as tm
 from pandas.tests.test_base import CheckImmutable, CheckStringMixin
-from pandas.indexes.frozen import FrozenList, FrozenNDArray
+from pandas.core.indexes.frozen import FrozenList, FrozenNDArray
 from pandas.compat import u
 
 

pandas/tests/indexes/test_multi.py

@@ -16,7 +16,7 @@
                     compat, date_range, period_range)
 from pandas.compat import PY3, long, lrange, lzip, range, u
 from pandas.errors import PerformanceWarning, UnsortedIndexError
-from pandas.indexes.base import InvalidIndexError
+from pandas.core.indexes.base import InvalidIndexError
 from pandas._libs import lib
 from pandas._libs.lib import Timestamp
 

pandas/tseries/base.py

@@ -28,12 +28,12 @@
 from pandas._libs.period import Period
 
 from pandas.core.index import Index
-from pandas.indexes.base import _index_shared_docs
+from pandas.core.indexes.base import _index_shared_docs
 from pandas.util.decorators import Appender, cache_readonly
 import pandas.core.dtypes.concat as _concat
 import pandas.tseries.frequencies as frequencies
 
-import pandas.indexes.base as ibase
+import pandas.core.indexes.base as ibase
 _index_doc_kwargs = dict(ibase._index_doc_kwargs)
 
 

pandas/tseries/index.py

@@ -30,7 +30,7 @@
 from pandas.core.common import _values_from_object, _maybe_box
 
 from pandas.core.index import Index, Int64Index, Float64Index
-from pandas.indexes.base import _index_shared_docs
+from pandas.core.indexes.base import _index_shared_docs
 import pandas.compat as compat
 from pandas.tseries.frequencies import (
     to_offset, get_period_alias,

pandas/tseries/period.py

@@ -37,14 +37,14 @@
                                  _quarter_to_myear)
 
 from pandas.core.base import _shared_docs
-from pandas.indexes.base import _index_shared_docs, _ensure_index
+from pandas.core.indexes.base import _index_shared_docs, _ensure_index
 
 from pandas import compat
 from pandas.util.decorators import (Appender, Substitution, cache_readonly,
                                     deprecate_kwarg)
 from pandas.compat import zip, u
 
-import pandas.indexes.base as ibase
+import pandas.core.indexes.base as ibase
 _index_doc_kwargs = dict(ibase._index_doc_kwargs)
 _index_doc_kwargs.update(
     dict(target_klass='PeriodIndex or list of Periods'))

pandas/tseries/tdi.py

@@ -23,7 +23,7 @@
 from pandas.tseries.frequencies import to_offset
 from pandas.core.algorithms import checked_add_with_arr
 from pandas.core.base import _shared_docs
-from pandas.indexes.base import _index_shared_docs
+from pandas.core.indexes.base import _index_shared_docs
 import pandas.core.common as com
 import pandas.core.dtypes.concat as _concat
 from pandas.util.decorators import Appender, Substitution, deprecate_kwarg

setup.py

@@ -640,9 +640,9 @@ def pxd(name):
                 'pandas.compat.numpy',
                 'pandas.core',
                 'pandas.core.dtypes',
+                'pandas.core.indexes',
                 'pandas.core.computation',
                 'pandas.core.sparse',
-                'pandas.indexes',
                 'pandas.errors',
                 'pandas.io',
                 'pandas.io.json',