Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR #48608 on branch 1.5.x (REGR: assert_index_equal raising with non matching pd.NA) #48800

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.5.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ Fixed regressions
Bug fixes
~~~~~~~~~
- Bug in :meth:`DataFrame.to_hdf` raising ``AssertionError`` with boolean index (:issue:`48667`)
- Bug in :func:`assert_index_equal` for extension arrays with non matching ``NA`` raising ``ValueError`` (:issue:`48608`)
- Bug in :meth:`DataFrame.pivot_table` raising unexpected ``FutureWarning`` when setting datetime column as index (:issue:`48683`)
-

Expand Down
4 changes: 4 additions & 0 deletions pandas/_libs/testing.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ cpdef assert_almost_equal(a, b,
# nan / None comparison
return True

if isna(a) and not isna(b) or not isna(a) and isna(b):
# boolean value of pd.NA is ambigous
raise AssertionError(f"{a} != {b}")

if a == b:
# object comparison
return True
Expand Down
3 changes: 3 additions & 0 deletions pandas/_testing/asserters.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,9 @@ def _get_ilevel_values(index, level):
if not left.equals(right):
mismatch = left._values != right._values

if is_extension_array_dtype(mismatch):
mismatch = cast("ExtensionArray", mismatch).fillna(True)

diff = np.sum(mismatch.astype(int)) * 100.0 / len(left)
msg = f"{obj} values are different ({np.round(diff, 5)} %)"
raise_assert_detail(obj, msg, left, right)
Expand Down
13 changes: 13 additions & 0 deletions pandas/tests/util/test_assert_index_equal.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import pytest

from pandas import (
NA,
Categorical,
CategoricalIndex,
Index,
Expand Down Expand Up @@ -264,3 +265,15 @@ def test_assert_index_equal_object_ints_order_false():
idx1 = Index([1, 3], dtype="object")
idx2 = Index([3, 1], dtype="object")
tm.assert_index_equal(idx1, idx2, check_order=False)


@pytest.mark.parametrize("check_categorical", [True, False])
@pytest.mark.parametrize("check_names", [True, False])
def test_assert_ea_index_equal_non_matching_na(check_names, check_categorical):
# GH#48608
idx1 = Index([1, 2], dtype="Int64")
idx2 = Index([1, NA], dtype="Int64")
with pytest.raises(AssertionError, match="50.0 %"):
tm.assert_index_equal(
idx1, idx2, check_names=check_names, check_categorical=check_categorical
)