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.

Sign up for GitHub

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

BUG: __eq__ raising for new arrow string dtype for incompatible objects #56245

Merged
merged 5 commits into from
Dec 21, 2023
Merged

BUG: __eq__ raising for new arrow string dtype for incompatible objects #56245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b951690
BUG: __eq__ raising for new arrow string dtype for incompatible objects
phofl Nov 29, 2023
8be097f
Update test_logical_ops.py
phofl Nov 30, 2023
8bb43a4
Merge branch 'main' into string_comparison
phofl Dec 8, 2023
7aa825a
Merge branch 'main' into string_comparison
phofl Dec 21, 2023
9c182e0
Update pandas/core/arrays/string_arrow.py
phofl Dec 21, 2023
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/v2.2.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,7 @@ Strings
- Bug in :meth:`Series.str.find` when ``start < 0`` for :class:`ArrowDtype` with ``pyarrow.string`` (:issue:`56411`)
- Bug in :meth:`Series.str.replace` when ``n < 0`` for :class:`ArrowDtype` with ``pyarrow.string`` (:issue:`56404`)
- Bug in :meth:`Series.str.startswith` and :meth:`Series.str.endswith` with arguments of type ``tuple[str, ...]`` for ``string[pyarrow]`` (:issue:`54942`)
- Bug in comparison operations for ``dtype="string[pyarrow_numpy]"`` raising if dtypes can't be compared (:issue:`56008`)
jorisvandenbossche marked this conversation as resolved.
Show resolved Hide resolved

Interval
^^^^^^^^
Expand Down
6 changes: 5 additions & 1 deletion pandas/core/arrays/string_arrow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
BaseStringArray,
StringDtype,
)
from pandas.core.ops import invalid_comparison
from pandas.core.strings.object_array import ObjectStringArrayMixin

if not pa_version_under10p1:
Expand Down Expand Up @@ -662,7 +663,10 @@ def _convert_int_dtype(self, result):
return result

def _cmp_method(self, other, op):
result = super()._cmp_method(other, op)
try:
mroeschke marked this conversation as resolved.
Show resolved Hide resolved
result = super()._cmp_method(other, op)
except pa.ArrowNotImplementedError:
return invalid_comparison(self, other, op)
if op == operator.ne:
return result.to_numpy(np.bool_, na_value=True)
else:
Expand Down
16 changes: 16 additions & 0 deletions pandas/tests/series/test_logical_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,3 +530,19 @@ def test_int_dtype_different_index_not_bool(self):

result = ser1 ^ ser2
tm.assert_series_equal(result, expected)

def test_pyarrow_numpy_string_invalid(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would expect we already have tests for this behaviour, but then only in cases where it's not yet parametrized to use the string dtype?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

# GH#56008
pytest.importorskip("pyarrow")
ser = Series([False, True])
ser2 = Series(["a", "b"], dtype="string[pyarrow_numpy]")
result = ser == ser2
expected = Series(False, index=ser.index)
tm.assert_series_equal(result, expected)

result = ser != ser2
expected = Series(True, index=ser.index)
tm.assert_series_equal(result, expected)

with pytest.raises(TypeError, match="Invalid comparison"):
ser > ser2
Loading