Skip to content

Commit fd5dc65

Browse files
committed
REF: extract function _assert_series_values_equal
1 parent 0be8f99 commit fd5dc65

File tree

1 file changed

+50
-22
lines changed

1 file changed

+50
-22
lines changed

pandas/_testing.py

Lines changed: 50 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,6 @@ def assert_series_equal(
12891289
rtol=1.0e-5,
12901290
atol=1.0e-8,
12911291
obj="Series",
1292-
check_index=True,
12931292
):
12941293
"""
12951294
Check that left and right Series are equal.
@@ -1349,10 +1348,6 @@ def assert_series_equal(
13491348
obj : str, default 'Series'
13501349
Specify object name being compared, internally used to show appropriate
13511350
assertion message.
1352-
check_index : bool, default True
1353-
Whether to check index equivalence. If False, then compare only values.
1354-
1355-
.. versionadded:: 1.2.0
13561351
13571352
Examples
13581353
--------
@@ -1363,6 +1358,55 @@ def assert_series_equal(
13631358
"""
13641359
__tracebackhide__ = True
13651360

1361+
_assert_series_values_equal(
1362+
left,
1363+
right,
1364+
check_dtype=check_dtype,
1365+
check_series_type=check_series_type,
1366+
check_less_precise=check_less_precise,
1367+
check_names=check_names,
1368+
check_exact=check_exact,
1369+
check_datetimelike_compat=check_datetimelike_compat,
1370+
check_categorical=check_categorical,
1371+
check_category_order=check_category_order,
1372+
check_freq=check_freq,
1373+
check_flags=check_flags,
1374+
rtol=rtol,
1375+
atol=atol,
1376+
obj=obj,
1377+
)
1378+
1379+
assert_index_equal(
1380+
left.index,
1381+
right.index,
1382+
exact=check_index_type,
1383+
check_names=check_names,
1384+
check_exact=check_exact,
1385+
check_categorical=check_categorical,
1386+
rtol=rtol,
1387+
atol=atol,
1388+
obj=f"{obj}.index",
1389+
)
1390+
1391+
1392+
def _assert_series_values_equal(
1393+
left,
1394+
right,
1395+
*,
1396+
check_dtype=True,
1397+
check_series_type=True,
1398+
check_less_precise=no_default,
1399+
check_names=True,
1400+
check_exact=False,
1401+
check_datetimelike_compat=False,
1402+
check_categorical=True,
1403+
check_category_order=True,
1404+
check_freq=True,
1405+
check_flags=True,
1406+
rtol=1.0e-5,
1407+
atol=1.0e-8,
1408+
obj="Series",
1409+
):
13661410
if check_less_precise is not no_default:
13671411
warnings.warn(
13681412
"The 'check_less_precise' keyword in testing.assert_*_equal "
@@ -1388,20 +1432,6 @@ def assert_series_equal(
13881432
if check_flags:
13891433
assert left.flags == right.flags, f"{repr(left.flags)} != {repr(right.flags)}"
13901434

1391-
if check_index:
1392-
# GH #38183
1393-
assert_index_equal(
1394-
left.index,
1395-
right.index,
1396-
exact=check_index_type,
1397-
check_names=check_names,
1398-
check_exact=check_exact,
1399-
check_categorical=check_categorical,
1400-
rtol=rtol,
1401-
atol=atol,
1402-
obj=f"{obj}.index",
1403-
)
1404-
14051435
if check_freq and isinstance(left.index, (pd.DatetimeIndex, pd.TimedeltaIndex)):
14061436
lidx = left.index
14071437
ridx = right.index
@@ -1697,11 +1727,10 @@ def assert_frame_equal(
16971727
assert col in right
16981728
lcol = left.iloc[:, i]
16991729
rcol = right.iloc[:, i]
1700-
assert_series_equal(
1730+
_assert_series_values_equal(
17011731
lcol,
17021732
rcol,
17031733
check_dtype=check_dtype,
1704-
check_index_type=check_index_type,
17051734
check_exact=check_exact,
17061735
check_names=check_names,
17071736
check_datetimelike_compat=check_datetimelike_compat,
@@ -1710,7 +1739,6 @@ def assert_frame_equal(
17101739
obj=f'{obj}.iloc[:, {i}] (column name="{col}")',
17111740
rtol=rtol,
17121741
atol=atol,
1713-
check_index=False,
17141742
)
17151743

17161744

0 commit comments

Comments
 (0)