Skip to content

Commit b32c503

Browse files
Terji PetersenTerji Petersen
Terji Petersen
authored and
Terji Petersen
committed
DEPR: don't make Index instantiate Int64/Uint64/Flaot64Index
1 parent b16b732 commit b32c503

File tree

1 file changed

+35
-28
lines changed

1 file changed

+35
-28
lines changed

pandas/tests/util/test_assert_index_equal.py

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_index_equal_levels_mismatch():
1717
msg = """Index are different
1818
1919
Index levels are different
20-
\\[left\\]: 1, Int64Index\\(\\[1, 2, 3\\], dtype='int64'\\)
20+
\\[left\\]: 1, NumericIndex\\(\\[1, 2, 3\\], dtype='int64'\\)
2121
\\[right\\]: 2, MultiIndex\\(\\[\\('A', 1\\),
2222
\\('A', 2\\),
2323
\\('B', 3\\),
@@ -35,8 +35,8 @@ def test_index_equal_values_mismatch(check_exact):
3535
msg = """MultiIndex level \\[1\\] are different
3636
3737
MultiIndex level \\[1\\] values are different \\(25\\.0 %\\)
38-
\\[left\\]: Int64Index\\(\\[2, 2, 3, 4\\], dtype='int64'\\)
39-
\\[right\\]: Int64Index\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
38+
\\[left\\]: NumericIndex\\(\\[2, 2, 3, 4\\], dtype='int64'\\)
39+
\\[right\\]: NumericIndex\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
4040

4141
idx1 = MultiIndex.from_tuples([("A", 2), ("A", 2), ("B", 3), ("B", 4)])
4242
idx2 = MultiIndex.from_tuples([("A", 1), ("A", 2), ("B", 3), ("B", 4)])
@@ -49,8 +49,8 @@ def test_index_equal_length_mismatch(check_exact):
4949
msg = """Index are different
5050
5151
Index length are different
52-
\\[left\\]: 3, Int64Index\\(\\[1, 2, 3\\], dtype='int64'\\)
53-
\\[right\\]: 4, Int64Index\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
52+
\\[left\\]: 3, NumericIndex\\(\\[1, 2, 3\\], dtype='int64'\\)
53+
\\[right\\]: 4, NumericIndex\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
5454

5555
idx1 = Index([1, 2, 3])
5656
idx2 = Index([1, 2, 3, 4])
@@ -67,22 +67,29 @@ def test_index_equal_class(exact):
6767
tm.assert_index_equal(idx1, idx2, exact=exact)
6868

6969

70-
@pytest.mark.parametrize(
71-
"idx_values, msg_str",
72-
[
73-
[[1, 2, 3.0], "Float64Index\\(\\[1\\.0, 2\\.0, 3\\.0\\], dtype='float64'\\)"],
74-
[range(3), "RangeIndex\\(start=0, stop=3, step=1\\)"],
75-
],
76-
)
77-
def test_index_equal_class_mismatch(check_exact, idx_values, msg_str):
78-
msg = f"""Index are different
70+
def test_int_float_index_equal_class_mismatch(check_exact):
71+
msg = """Index are different
72+
73+
Attribute "inferred_type" are different
74+
\\[left\\]: integer
75+
\\[right\\]: floating"""
76+
77+
idx1 = Index([1, 2, 3])
78+
idx2 = Index([1, 2, 3], dtype=np.float64)
79+
80+
with pytest.raises(AssertionError, match=msg):
81+
tm.assert_index_equal(idx1, idx2, exact=True, check_exact=check_exact)
82+
83+
84+
def test_range_index_equal_class_mismatch(check_exact):
85+
msg = """Index are different
7986
8087
Index classes are different
81-
\\[left\\]: Int64Index\\(\\[1, 2, 3\\], dtype='int64'\\)
82-
\\[right\\]: {msg_str}"""
88+
\\[left\\]: NumericIndex\\(\\[1, 2, 3\\], dtype='int64'\\)
89+
\\[right\\]: """
8390

8491
idx1 = Index([1, 2, 3])
85-
idx2 = Index(idx_values)
92+
idx2 = RangeIndex(range(3))
8693

8794
with pytest.raises(AssertionError, match=msg):
8895
tm.assert_index_equal(idx1, idx2, exact=True, check_exact=check_exact)
@@ -96,8 +103,8 @@ def test_index_equal_values_close(check_exact):
96103
msg = """Index are different
97104
98105
Index values are different \\(33\\.33333 %\\)
99-
\\[left\\]: Float64Index\\(\\[1.0, 2.0, 3.0], dtype='float64'\\)
100-
\\[right\\]: Float64Index\\(\\[1.0, 2.0, 3.0000000001\\], dtype='float64'\\)"""
106+
\\[left\\]: NumericIndex\\(\\[1.0, 2.0, 3.0], dtype='float64'\\)
107+
\\[right\\]: NumericIndex\\(\\[1.0, 2.0, 3.0000000001\\], dtype='float64'\\)"""
101108

102109
with pytest.raises(AssertionError, match=msg):
103110
tm.assert_index_equal(idx1, idx2, check_exact=check_exact)
@@ -114,8 +121,8 @@ def test_index_equal_values_less_close(check_exact, rtol):
114121
msg = """Index are different
115122
116123
Index values are different \\(33\\.33333 %\\)
117-
\\[left\\]: Float64Index\\(\\[1.0, 2.0, 3.0], dtype='float64'\\)
118-
\\[right\\]: Float64Index\\(\\[1.0, 2.0, 3.0001\\], dtype='float64'\\)"""
124+
\\[left\\]: NumericIndex\\(\\[1.0, 2.0, 3.0], dtype='float64'\\)
125+
\\[right\\]: NumericIndex\\(\\[1.0, 2.0, 3.0001\\], dtype='float64'\\)"""
119126

120127
with pytest.raises(AssertionError, match=msg):
121128
tm.assert_index_equal(idx1, idx2, **kwargs)
@@ -131,8 +138,8 @@ def test_index_equal_values_too_far(check_exact, rtol):
131138
msg = """Index are different
132139
133140
Index values are different \\(33\\.33333 %\\)
134-
\\[left\\]: Int64Index\\(\\[1, 2, 3\\], dtype='int64'\\)
135-
\\[right\\]: Int64Index\\(\\[1, 2, 4\\], dtype='int64'\\)"""
141+
\\[left\\]: NumericIndex\\(\\[1, 2, 3\\], dtype='int64'\\)
142+
\\[right\\]: NumericIndex\\(\\[1, 2, 4\\], dtype='int64'\\)"""
136143

137144
with pytest.raises(AssertionError, match=msg):
138145
tm.assert_index_equal(idx1, idx2, **kwargs)
@@ -146,8 +153,8 @@ def test_index_equal_value_oder_mismatch(check_exact, rtol, check_order):
146153
msg = """Index are different
147154
148155
Index values are different \\(66\\.66667 %\\)
149-
\\[left\\]: Int64Index\\(\\[1, 2, 3\\], dtype='int64'\\)
150-
\\[right\\]: Int64Index\\(\\[3, 2, 1\\], dtype='int64'\\)"""
156+
\\[left\\]: NumericIndex\\(\\[1, 2, 3\\], dtype='int64'\\)
157+
\\[right\\]: NumericIndex\\(\\[3, 2, 1\\], dtype='int64'\\)"""
151158

152159
if check_order:
153160
with pytest.raises(AssertionError, match=msg):
@@ -168,8 +175,8 @@ def test_index_equal_level_values_mismatch(check_exact, rtol):
168175
msg = """MultiIndex level \\[1\\] are different
169176
170177
MultiIndex level \\[1\\] values are different \\(25\\.0 %\\)
171-
\\[left\\]: Int64Index\\(\\[2, 2, 3, 4\\], dtype='int64'\\)
172-
\\[right\\]: Int64Index\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
178+
\\[left\\]: NumericIndex\\(\\[2, 2, 3, 4\\], dtype='int64'\\)
179+
\\[right\\]: NumericIndex\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
173180

174181
with pytest.raises(AssertionError, match=msg):
175182
tm.assert_index_equal(idx1, idx2, **kwargs)
@@ -225,7 +232,7 @@ def test_index_equal_range_categories(check_categorical, exact):
225232
226233
Index classes are different
227234
\\[left\\]: RangeIndex\\(start=0, stop=10, step=1\\)
228-
\\[right\\]: Int64Index\\(\\[0, 1, 2, 3, 4, 5, 6, 7, 8, 9\\], dtype='int64'\\)"""
235+
\\[right\\]: NumericIndex\\(\\[0, 1, 2, 3, 4, 5, 6, 7, 8, 9\\], dtype='int64'\\)"""
229236

230237
rcat = CategoricalIndex(RangeIndex(10))
231238
icat = CategoricalIndex(list(range(10)))

0 commit comments

Comments
 (0)