diff --git a/pandas/tests/frame/methods/test_reset_index.py b/pandas/tests/frame/methods/test_reset_index.py index 56fd633f5f22b..5864b547a552b 100644 --- a/pandas/tests/frame/methods/test_reset_index.py +++ b/pandas/tests/frame/methods/test_reset_index.py @@ -130,7 +130,7 @@ def test_reset_index(self, float_frame): float_frame.index.name = "index" deleveled = float_frame.reset_index() tm.assert_series_equal(deleveled["index"], Series(float_frame.index)) - tm.assert_index_equal(deleveled.index, Index(np.arange(len(deleveled)))) + tm.assert_index_equal(deleveled.index, Index(range(len(deleveled))), exact=True) # preserve column names float_frame.columns.name = "columns" diff --git a/pandas/tests/frame/test_constructors.py b/pandas/tests/frame/test_constructors.py index e279c5872da03..a98723e9e31f8 100644 --- a/pandas/tests/frame/test_constructors.py +++ b/pandas/tests/frame/test_constructors.py @@ -352,7 +352,7 @@ def test_constructor_dict(self): # with dict of empty list and Series frame = DataFrame({"A": [], "B": []}, columns=["A", "B"]) - tm.assert_index_equal(frame.index, Index([], dtype=np.int64)) + tm.assert_index_equal(frame.index, RangeIndex(0), exact=True) # GH 14381 # Dict with None value @@ -802,14 +802,14 @@ def _check_basic_constructor(self, empty): # automatic labeling frame = DataFrame(mat) - tm.assert_index_equal(frame.index, pd.Int64Index(range(2))) - tm.assert_index_equal(frame.columns, pd.Int64Index(range(3))) + tm.assert_index_equal(frame.index, Index(range(2)), exact=True) + tm.assert_index_equal(frame.columns, Index(range(3)), exact=True) frame = DataFrame(mat, index=[1, 2]) - tm.assert_index_equal(frame.columns, pd.Int64Index(range(3))) + tm.assert_index_equal(frame.columns, Index(range(3)), exact=True) frame = DataFrame(mat, columns=["A", "B", "C"]) - tm.assert_index_equal(frame.index, pd.Int64Index(range(2))) + tm.assert_index_equal(frame.index, Index(range(2)), exact=True) # 0-length axis frame = DataFrame(empty((0, 3))) diff --git a/pandas/tests/indexes/common.py b/pandas/tests/indexes/common.py index 3c0e4d83964c5..e250d8cf1b326 100644 --- a/pandas/tests/indexes/common.py +++ b/pandas/tests/indexes/common.py @@ -529,6 +529,7 @@ def test_equals_op(self): # assuming the 2nd to last item is unique in the data item = index_a[-2] tm.assert_numpy_array_equal(index_a == item, expected3) + # For RangeIndex we can convert to Int64Index tm.assert_series_equal(series_a == item, Series(expected3)) def test_format(self): @@ -656,6 +657,7 @@ def test_map(self): expected = index result = index.map(lambda x: x) + # For RangeIndex we convert to Int64Index tm.assert_index_equal(result, expected) @pytest.mark.parametrize( @@ -680,6 +682,7 @@ def test_map_dictlike(self, mapper): expected = index result = index.map(identity) + # For RangeIndex we convert to Int64Index tm.assert_index_equal(result, expected) # empty mappable diff --git a/pandas/tests/indexes/test_setops.py b/pandas/tests/indexes/test_setops.py index 1be17a9d6116a..0973cef7cfdc1 100644 --- a/pandas/tests/indexes/test_setops.py +++ b/pandas/tests/indexes/test_setops.py @@ -385,8 +385,8 @@ def test_difference_preserves_type_empty(self, index, sort): if not index.is_unique: return result = index.difference(index, sort=sort) - expected = index.drop(index) - tm.assert_index_equal(result, expected) + expected = index[:0] + tm.assert_index_equal(result, expected, exact=True) def test_intersection_difference_match_empty(self, index, sort): # GH#20040 @@ -395,6 +395,6 @@ def test_intersection_difference_match_empty(self, index, sort): # of an index with itself. Test for all types if not index.is_unique: return - inter = index.intersection(index.drop(index)) + inter = index.intersection(index[:0]) diff = index.difference(index, sort=sort) - tm.assert_index_equal(inter, diff) + tm.assert_index_equal(inter, diff, exact=True) diff --git a/pandas/tests/reshape/concat/test_series.py b/pandas/tests/reshape/concat/test_series.py index 20838a418cfea..2d681e792914c 100644 --- a/pandas/tests/reshape/concat/test_series.py +++ b/pandas/tests/reshape/concat/test_series.py @@ -106,9 +106,9 @@ def test_concat_series_axis1_same_names_ignore_index(self): s2 = Series(np.random.randn(len(dates)), index=dates, name="value") result = concat([s1, s2], axis=1, ignore_index=True) - expected = Index([0, 1]) + expected = Index(range(2)) - tm.assert_index_equal(result.columns, expected) + tm.assert_index_equal(result.columns, expected, exact=True) @pytest.mark.parametrize( "s1name,s2name", [(np.int64(190), (43, 0)), (190, (43, 0))] diff --git a/pandas/tests/reshape/merge/test_join.py b/pandas/tests/reshape/merge/test_join.py index 00ef7a05f5902..ad07ced2fca66 100644 --- a/pandas/tests/reshape/merge/test_join.py +++ b/pandas/tests/reshape/merge/test_join.py @@ -504,7 +504,7 @@ def test_join_sort(self): # smoke test joined = left.join(right, on="key", sort=False) - tm.assert_index_equal(joined.index, Index(list(range(4)))) + tm.assert_index_equal(joined.index, Index(range(4)), exact=True) def test_join_mixed_non_unique_index(self): # GH 12814, unorderable types in py3 with a non-unique index diff --git a/pandas/tests/series/test_constructors.py b/pandas/tests/series/test_constructors.py index d790a85c94193..5b13091470b09 100644 --- a/pandas/tests/series/test_constructors.py +++ b/pandas/tests/series/test_constructors.py @@ -556,7 +556,7 @@ def test_series_ctor_plus_datetimeindex(self): def test_constructor_default_index(self): s = Series([0, 1, 2]) - tm.assert_index_equal(s.index, Index(np.arange(3))) + tm.assert_index_equal(s.index, Index(range(3)), exact=True) @pytest.mark.parametrize( "input",