Skip to content

Commit 771a19c

Browse files
committed
Returned accidentally removed update note, modified test_add_frame to remove double negative
1 parent 30d4a07 commit 771a19c

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

doc/source/whatsnew/v3.0.0.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,7 @@ MultiIndex
10821082
- :meth:`MultiIndex.insert` would not insert NA value correctly at unified location of index -1 (:issue:`59003`)
10831083
- :func:`MultiIndex.get_level_values` accessing a :class:`DatetimeIndex` does not carry the frequency attribute along (:issue:`58327`, :issue:`57949`)
10841084
- Bug in :class:`DataFrame` arithmetic operations in case of unaligned MultiIndex columns (:issue:`60498`)
1085+
- Bug in :class:`DataFrame` arithmetic operations with :class:`Series` in case of unaligned MultiIndex (:issue:`61009`)
10851086
- Bug in :class:`DataFrame` arithmetic operations with :class:`Series` now works with ``fill_value`` parameter (:issue:`61581`)
10861087
- Bug in :meth:`MultiIndex.union` raising when indexes have duplicates with differing names (:issue:`62059`)
10871088
- Bug in :meth:`MultiIndex.from_tuples` causing wrong output with input of type tuples having NaN values (:issue:`60695`, :issue:`60988`)

pandas/tests/arithmetic/test_string.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,15 @@ def test_add_strings(any_string_dtype, request):
257257
tm.assert_frame_equal(result, expected)
258258

259259

260-
@pytest.mark.xfail(reason="GH-28527")
261-
def test_add_frame(request, dtype):
262-
if dtype.storage == "python":
263-
# Inconsistent behavior between different versions of the python engine.
264-
# Some return correctly, some return but with the wrong dtype
265-
# Others just fail, we are blanket failing all
266-
mark = pytest.mark.xfail(reason="[XPASS(strict)] GH-28527")
267-
request.node.applymarker(mark)
260+
def test_add_frame(any_string_dtype, request):
261+
# Inconsistent behavior between different versions of the python engine.
262+
# Environments without PyArrow correctly return the value for python storage
263+
# The same does not hold for
264+
dtype = any_string_dtype
265+
if HAS_PYARROW or getattr(dtype, "storage", None) != "python":
266+
marks = pytest.mark.xfail(reason="GH-28527")
267+
request.applymarker(marks)
268+
268269
arr = pd.array(["a", "b", np.nan, np.nan], dtype=dtype)
269270
df = pd.DataFrame([["x", np.nan, "y", np.nan]])
270271
assert arr.__add__(df) is NotImplemented

0 commit comments

Comments
 (0)