Skip to content

Commit 73372e6

Browse files
committed
set exact to True and fix tests
1 parent daef3ff commit 73372e6

File tree

7 files changed

+23
-8
lines changed

7 files changed

+23
-8
lines changed

pandas/_testing/asserters.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,13 +1384,23 @@ def assert_equal(left, right, **kwargs) -> None:
13841384
__tracebackhide__ = True
13851385

13861386
if isinstance(left, Index):
1387-
assert_index_equal(left, right, **kwargs)
1387+
exact = kwargs.pop("exact", True)
1388+
assert_index_equal(left, right, exact=exact, **kwargs)
13881389
if isinstance(left, (DatetimeIndex, TimedeltaIndex)):
13891390
assert left.freq == right.freq, (left.freq, right.freq)
13901391
elif isinstance(left, Series):
1391-
assert_series_equal(left, right, **kwargs)
1392+
check_index_type = kwargs.pop("check_index_type", True)
1393+
assert_series_equal(left, right, check_index_type=check_index_type, **kwargs)
13921394
elif isinstance(left, DataFrame):
1393-
assert_frame_equal(left, right, **kwargs)
1395+
check_index_type = kwargs.pop("check_index_type", True)
1396+
check_column_type = kwargs.pop("check_column_type", True)
1397+
assert_frame_equal(
1398+
left,
1399+
right,
1400+
check_index_type=check_index_type,
1401+
check_column_type=check_column_type,
1402+
**kwargs,
1403+
)
13941404
elif isinstance(left, IntervalArray):
13951405
assert_interval_array_equal(left, right, **kwargs)
13961406
elif isinstance(left, PeriodArray):

pandas/tests/arrays/sparse/test_array.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,9 @@ def test_dropna(fill_value):
481481
tm.assert_sp_array_equal(arr.dropna(), exp)
482482

483483
df = pd.DataFrame({"a": [0, 1], "b": arr})
484-
expected_df = pd.DataFrame({"a": [1], "b": exp}, index=pd.Index([1]))
484+
expected_df = pd.DataFrame(
485+
{"a": [1], "b": exp}, index=pd.RangeIndex(start=1, stop=2, step=1)
486+
)
485487
tm.assert_equal(df.dropna(), expected_df)
486488

487489

pandas/tests/frame/methods/test_asof.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
from pandas import (
77
DataFrame,
8+
Index,
89
Period,
910
Series,
1011
Timestamp,
@@ -105,7 +106,7 @@ def test_asof_all_nans(self, frame_or_series):
105106
# GH 15713
106107
# DataFrame/Series is all nans
107108
result = frame_or_series([np.nan]).asof([0])
108-
expected = frame_or_series([np.nan])
109+
expected = frame_or_series([np.nan], index=Index([0]))
109110
tm.assert_equal(result, expected)
110111

111112
def test_all_nans(self, date_range_frame):

pandas/tests/groupby/test_all_methods.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def test_not_c_contiguous_mask(groupby_func):
9191
if groupby_func == "corrwith":
9292
# corrwith is deprecated
9393
return
94-
df = DataFrame({"a": [1, 1, 2], "b": [3, 4, 5]}, dtype="Int64")
94+
df = DataFrame({"a": [1, 1, 2], "b": [3, 4, 5]}, dtype="Int64", index=[0, 1, 2])
9595
reversed = DataFrame(
9696
{"a": [2, 1, 1], "b": [5, 4, 3]}, dtype="Int64", index=[2, 1, 0]
9797
)[::-1]

pandas/tests/groupby/test_groupby.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,6 +1834,7 @@ def get_categorical_invalid_expected():
18341834
if override_dtype is not None:
18351835
expected = expected.astype(override_dtype)
18361836
if len(keys) == 1:
1837+
expected.index = Index([], dtype=df[keys[0]].dtype, name=keys[0])
18371838
expected.index.name = keys[0]
18381839
tm.assert_equal(result, expected)
18391840

pandas/tests/groupby/test_grouping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ def test_groupby_series_named_with_tuple(self, frame_or_series, index):
465465
obj = frame_or_series([1, 2, 3, 4], index=index)
466466
groups = Series([1, 0, 1, 0], index=index, name=("a", "a"))
467467
result = obj.groupby(groups).last()
468-
expected = frame_or_series([4, 3])
468+
expected = frame_or_series([4, 3], index=Index([0, 1]))
469469
expected.index.name = ("a", "a")
470470
tm.assert_equal(result, expected)
471471

pandas/tests/io/pytables/test_timezones.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from pandas import (
1414
DataFrame,
1515
DatetimeIndex,
16+
Index,
1617
Series,
1718
Timestamp,
1819
date_range,
@@ -241,7 +242,7 @@ def test_timezones_fixed_format_empty(temp_hdfstore, tz_aware_fixture, frame_or_
241242

242243
dtype = pd.DatetimeTZDtype(tz=tz_aware_fixture)
243244

244-
obj = Series(dtype=dtype, name="A")
245+
obj = Series(dtype=dtype, name="A", index=Index([]))
245246
if frame_or_series is DataFrame:
246247
obj = obj.to_frame()
247248

0 commit comments

Comments
 (0)