Skip to content

Commit 1a117fc

Browse files
jrebackjreback
authored
CLN: move pandas.indexes -> pandas.core.indexes (#16031)
1 parent 89bd268 commit 1a117fc

26 files changed

+63
-48
lines changed

‎doc/source/whatsnew/v0.20.0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1344,6 +1344,7 @@ If indicated, a deprecation warning will be issued if you reference theses modul
13441344
"pandas.index", "pandas._libs.index", ""
13451345
"pandas.algos", "pandas._libs.algos", ""
13461346
"pandas.hashtable", "pandas._libs.hashtable", ""
1347+
"pandas.indexes", "pandas.core.indexes", ""
13471348
"pandas.json", "pandas.io.json.libjson", "X"
13481349
"pandas.parser", "pandas.io.libparsers", "X"
13491350
"pandas.formats", "pandas.io.formats", ""

‎pandas/compat/pickle_compat.py

+13-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ def load_reduce(self):
5959

6060
# 15477
6161
('pandas.core.base', 'FrozenNDArray'):
62-
('pandas.indexes.frozen', 'FrozenNDArray'),
62+
('pandas.core.indexes.frozen', 'FrozenNDArray'),
6363
('pandas.core.base', 'FrozenList'):
64-
('pandas.indexes.frozen', 'FrozenList'),
64+
('pandas.core.indexes.frozen', 'FrozenList'),
6565

6666
# 10890
6767
('pandas.core.series', 'TimeSeries'):
@@ -84,7 +84,17 @@ def load_reduce(self):
8484
('pandas.sparse.series', 'SparseSeries'):
8585
('pandas.core.sparse.series', 'SparseSeries'),
8686
('pandas.sparse.frame', 'SparseDataFrame'):
87-
('pandas.core.sparse.frame', 'SparseDataFrame')
87+
('pandas.core.sparse.frame', 'SparseDataFrame'),
88+
('pandas.indexes.base', '_new_Index'):
89+
('pandas.core.indexes.base', '_new_Index'),
90+
('pandas.indexes.base', 'Index'):
91+
('pandas.core.indexes.base', 'Index'),
92+
('pandas.indexes.numeric', 'Int64Index'):
93+
('pandas.core.indexes.numeric', 'Int64Index'),
94+
('pandas.indexes.range', 'RangeIndex'):
95+
('pandas.core.indexes.range', 'RangeIndex'),
96+
('pandas.indexes.multi', 'MultiIndex'):
97+
('pandas.core.indexes.multi', 'MultiIndex')
8898
}
8999

90100

‎pandas/core/api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from pandas.core.index import (Index, CategoricalIndex, Int64Index,
1313
UInt64Index, RangeIndex, Float64Index,
1414
MultiIndex, IntervalIndex)
15-
from pandas.indexes.interval import Interval, interval_range
15+
from pandas.core.indexes.interval import Interval, interval_range
1616

1717
from pandas.core.series import Series
1818
from pandas.core.frame import DataFrame

‎pandas/core/categorical.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2128,7 +2128,7 @@ def _factorize_from_iterable(values):
21282128
If `values` has a categorical dtype, then `categories` is
21292129
a CategoricalIndex keeping the categories and order of `values`.
21302130
"""
2131-
from pandas.indexes.category import CategoricalIndex
2131+
from pandas.core.indexes.category import CategoricalIndex
21322132

21332133
if not is_list_like(values):
21342134
raise TypeError("Input must be list-like")

‎pandas/core/index.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# flake8: noqa
2-
from pandas.indexes.api import *
3-
from pandas.indexes.multi import _sparsify
2+
from pandas.core.indexes.api import *
3+
from pandas.core.indexes.multi import _sparsify

‎pandas/indexes/__init__.py renamed to ‎pandas/core/indexes/__init__.py

File renamed without changes.

‎pandas/indexes/api.py renamed to ‎pandas/core/indexes/api.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
from pandas.indexes.base import (Index, _new_Index, # noqa
1+
from pandas.core.indexes.base import (Index, _new_Index, # noqa
22
_ensure_index, _get_na_value,
33
InvalidIndexError)
4-
from pandas.indexes.category import CategoricalIndex # noqa
5-
from pandas.indexes.multi import MultiIndex # noqa
6-
from pandas.indexes.interval import IntervalIndex # noqa
7-
from pandas.indexes.numeric import (NumericIndex, Float64Index, # noqa
4+
from pandas.core.indexes.category import CategoricalIndex # noqa
5+
from pandas.core.indexes.multi import MultiIndex # noqa
6+
from pandas.core.indexes.interval import IntervalIndex # noqa
7+
from pandas.core.indexes.numeric import (NumericIndex, Float64Index, # noqa
88
Int64Index, UInt64Index)
9-
from pandas.indexes.range import RangeIndex # noqa
9+
from pandas.core.indexes.range import RangeIndex # noqa
1010

1111
import pandas.core.common as com
1212
import pandas._libs.lib as lib

‎pandas/indexes/base.py renamed to ‎pandas/core/indexes/base.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import pandas.core.base as base
4444
from pandas.util.decorators import (Appender, Substitution, cache_readonly,
4545
deprecate, deprecate_kwarg)
46-
from pandas.indexes.frozen import FrozenList
46+
from pandas.core.indexes.frozen import FrozenList
4747
import pandas.core.common as com
4848
import pandas.core.dtypes.concat as _concat
4949
import pandas.core.missing as missing
@@ -1675,7 +1675,7 @@ def append(self, other):
16751675

16761676
if self.is_categorical():
16771677
# if calling index is category, don't check dtype of others
1678-
from pandas.indexes.category import CategoricalIndex
1678+
from pandas.core.indexes.category import CategoricalIndex
16791679
return CategoricalIndex._append_same_dtype(self, to_concat, name)
16801680

16811681
typs = _concat.get_dtype_kinds(to_concat)

‎pandas/indexes/category.py renamed to ‎pandas/core/indexes/category.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
from pandas.util.decorators import Appender, cache_readonly
1818
from pandas.core.config import get_option
19-
from pandas.indexes.base import Index, _index_shared_docs
19+
from pandas.core.indexes.base import Index, _index_shared_docs
2020
import pandas.core.base as base
2121
import pandas.core.missing as missing
22-
import pandas.indexes.base as ibase
22+
import pandas.core.indexes.base as ibase
2323

2424
_index_doc_kwargs = dict(ibase._index_doc_kwargs)
2525
_index_doc_kwargs.update(dict(target_klass='CategoricalIndex'))

‎pandas/indexes/frozen.py renamed to ‎pandas/core/indexes/frozen.py

File renamed without changes.

‎pandas/indexes/interval.py renamed to ‎pandas/core/indexes/interval.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,22 @@
1616
is_interval_dtype,
1717
is_scalar,
1818
is_integer)
19-
from pandas.indexes.base import (Index, _ensure_index,
20-
default_pprint, _index_shared_docs)
19+
from pandas.core.indexes.base import (
20+
Index, _ensure_index,
21+
default_pprint, _index_shared_docs)
2122

2223
from pandas._libs import Timestamp, Timedelta
23-
from pandas._libs.interval import (Interval, IntervalMixin, IntervalTree,
24-
intervals_to_interval_bounds)
24+
from pandas._libs.interval import (
25+
Interval, IntervalMixin, IntervalTree,
26+
intervals_to_interval_bounds)
2527

26-
from pandas.indexes.multi import MultiIndex
28+
from pandas.core.indexes.multi import MultiIndex
2729
from pandas.compat.numpy import function as nv
2830
from pandas.core import common as com
2931
from pandas.util.decorators import cache_readonly, Appender
3032
from pandas.core.config import get_option
3133

32-
import pandas.indexes.base as ibase
34+
import pandas.core.indexes.base as ibase
3335
_index_doc_kwargs = dict(ibase._index_doc_kwargs)
3436
_index_doc_kwargs.update(
3537
dict(klass='IntervalIndex',

‎pandas/indexes/multi.py renamed to ‎pandas/core/indexes/multi.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@
3535

3636
from pandas.core.config import get_option
3737

38-
from pandas.indexes.base import (Index, _ensure_index,
39-
_get_na_value, InvalidIndexError,
40-
_index_shared_docs)
41-
from pandas.indexes.frozen import FrozenNDArray, FrozenList, _ensure_frozen
42-
import pandas.indexes.base as ibase
38+
from pandas.core.indexes.base import (
39+
Index, _ensure_index,
40+
_get_na_value, InvalidIndexError,
41+
_index_shared_docs)
42+
from pandas.core.indexes.frozen import (
43+
FrozenNDArray, FrozenList, _ensure_frozen)
44+
import pandas.core.indexes.base as ibase
4345
_index_doc_kwargs = dict(ibase._index_doc_kwargs)
4446
_index_doc_kwargs.update(
4547
dict(klass='MultiIndex',

‎pandas/indexes/numeric.py renamed to ‎pandas/core/indexes/numeric.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99

1010
from pandas import compat
1111
from pandas.core import algorithms
12-
from pandas.indexes.base import Index, InvalidIndexError, _index_shared_docs
12+
from pandas.core.indexes.base import (
13+
Index, InvalidIndexError, _index_shared_docs)
1314
from pandas.util.decorators import Appender, cache_readonly
14-
import pandas.indexes.base as ibase
15+
import pandas.core.indexes.base as ibase
1516

1617

1718
_num_index_shared_docs = dict()

‎pandas/indexes/range.py renamed to ‎pandas/core/indexes/range.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
from pandas import compat
1313
from pandas.compat import lrange, range
1414
from pandas.compat.numpy import function as nv
15-
from pandas.indexes.base import Index, _index_shared_docs
15+
from pandas.core.indexes.base import Index, _index_shared_docs
1616
from pandas.util.decorators import Appender, cache_readonly
17-
import pandas.indexes.base as ibase
17+
import pandas.core.indexes.base as ibase
1818

19-
from pandas.indexes.numeric import Int64Index
19+
from pandas.core.indexes.numeric import Int64Index
2020

2121

2222
class RangeIndex(Int64Index):

‎pandas/core/sparse/array.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import pandas.core.ops as ops
3737
import pandas.io.formats.printing as printing
3838
from pandas.util.decorators import Appender
39-
from pandas.indexes.base import _index_shared_docs
39+
from pandas.core.indexes.base import _index_shared_docs
4040

4141

4242
_sparray_doc_kwargs = dict(klass='SparseArray')

‎pandas/tests/api/test_api.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ class TestPDApi(Base, tm.TestCase):
3030
ignored = ['tests', 'locale', 'conftest']
3131

3232
# top-level sub-packages
33-
lib = ['api', 'compat', 'core',
34-
'indexes', 'errors', 'pandas',
33+
lib = ['api', 'compat', 'core', 'errors', 'pandas',
3534
'plotting', 'test', 'testing', 'tools', 'tseries',
3635
'util', 'options', 'io']
3736

‎pandas/tests/indexes/common.py

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

‎pandas/tests/indexes/test_base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from datetime import datetime, timedelta
44

55
import pandas.util.testing as tm
6-
from pandas.indexes.api import Index, MultiIndex
6+
from pandas.core.indexes.api import Index, MultiIndex
77
from pandas.tests.indexes.common import Base
88

99
from pandas.compat import (range, lrange, lzip, u,

‎pandas/tests/indexes/test_category.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22

33
import pandas.util.testing as tm
4-
from pandas.indexes.api import Index, CategoricalIndex
4+
from pandas.core.indexes.api import Index, CategoricalIndex
55
from .common import Base
66

77
from pandas.compat import range, PY3

‎pandas/tests/indexes/test_frozen.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import numpy as np
22
from pandas.util import testing as tm
33
from pandas.tests.test_base import CheckImmutable, CheckStringMixin
4-
from pandas.indexes.frozen import FrozenList, FrozenNDArray
4+
from pandas.core.indexes.frozen import FrozenList, FrozenNDArray
55
from pandas.compat import u
66

77

‎pandas/tests/indexes/test_multi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
compat, date_range, period_range)
1717
from pandas.compat import PY3, long, lrange, lzip, range, u
1818
from pandas.errors import PerformanceWarning, UnsortedIndexError
19-
from pandas.indexes.base import InvalidIndexError
19+
from pandas.core.indexes.base import InvalidIndexError
2020
from pandas._libs import lib
2121
from pandas._libs.lib import Timestamp
2222

‎pandas/tseries/base.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
from pandas._libs.period import Period
2929

3030
from pandas.core.index import Index
31-
from pandas.indexes.base import _index_shared_docs
31+
from pandas.core.indexes.base import _index_shared_docs
3232
from pandas.util.decorators import Appender, cache_readonly
3333
import pandas.core.dtypes.concat as _concat
3434
import pandas.tseries.frequencies as frequencies
3535

36-
import pandas.indexes.base as ibase
36+
import pandas.core.indexes.base as ibase
3737
_index_doc_kwargs = dict(ibase._index_doc_kwargs)
3838

3939

‎pandas/tseries/index.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from pandas.core.common import _values_from_object, _maybe_box
3131

3232
from pandas.core.index import Index, Int64Index, Float64Index
33-
from pandas.indexes.base import _index_shared_docs
33+
from pandas.core.indexes.base import _index_shared_docs
3434
import pandas.compat as compat
3535
from pandas.tseries.frequencies import (
3636
to_offset, get_period_alias,

‎pandas/tseries/period.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
_quarter_to_myear)
3838

3939
from pandas.core.base import _shared_docs
40-
from pandas.indexes.base import _index_shared_docs, _ensure_index
40+
from pandas.core.indexes.base import _index_shared_docs, _ensure_index
4141

4242
from pandas import compat
4343
from pandas.util.decorators import (Appender, Substitution, cache_readonly,
4444
deprecate_kwarg)
4545
from pandas.compat import zip, u
4646

47-
import pandas.indexes.base as ibase
47+
import pandas.core.indexes.base as ibase
4848
_index_doc_kwargs = dict(ibase._index_doc_kwargs)
4949
_index_doc_kwargs.update(
5050
dict(target_klass='PeriodIndex or list of Periods'))

‎pandas/tseries/tdi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from pandas.tseries.frequencies import to_offset
2424
from pandas.core.algorithms import checked_add_with_arr
2525
from pandas.core.base import _shared_docs
26-
from pandas.indexes.base import _index_shared_docs
26+
from pandas.core.indexes.base import _index_shared_docs
2727
import pandas.core.common as com
2828
import pandas.core.dtypes.concat as _concat
2929
from pandas.util.decorators import Appender, Substitution, deprecate_kwarg

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -640,9 +640,9 @@ def pxd(name):
640640
'pandas.compat.numpy',
641641
'pandas.core',
642642
'pandas.core.dtypes',
643+
'pandas.core.indexes',
643644
'pandas.core.computation',
644645
'pandas.core.sparse',
645-
'pandas.indexes',
646646
'pandas.errors',
647647
'pandas.io',
648648
'pandas.io.json',

0 commit comments

Comments
 (0)