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

Jump to bottom

REGR: fix inplace arithmetic operation on Series no longer updating parent DataFrame #37497

Closed
wants to merge 2 commits into from
Closed

REGR: fix inplace arithmetic operation on Series no longer updating parent DataFrame #37497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e23ee1
REGR: fix inplace arithmetic operation on Series no longer updating p…
jorisvandenbossche Oct 29, 2020
6387a1d
xfail loc test
jorisvandenbossche Oct 29, 2020
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.1.4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Fixed regressions
- Fixed regression in :class:`StataReader` which required ``chunksize`` to be manually set when using an iterator to read a dataset (:issue:`37280`)
- Fixed regression in setitem with :meth:`DataFrame.iloc` which raised error when trying to set a value while filtering with a boolean list (:issue:`36741`)
- Fixed regression in :attr:`MultiIndex.is_monotonic_increasing` returning wrong results with ``NaN`` in at least one of the levels (:issue:`37220`)
- Fixed regression in inplace arithmetic operation on a Series not updating the parent DataFrame (:issue:`36373`)

.. ---------------------------------------------------------------------------

Expand Down
3 changes: 0 additions & 3 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11115,9 +11115,6 @@ def _inplace_method(self, other, op):
"""
result = op(self, other)

# Delete cacher
self._reset_cacher()

# this makes sure that we are aligned like the input
# we are updating inplace so we want to ignore is_copy
self._update_inplace(
Expand Down
8 changes: 7 additions & 1 deletion pandas/tests/frame/methods/test_drop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,13 @@ def test_drop_preserve_names(self):
@pytest.mark.parametrize(
"operation", ["__iadd__", "__isub__", "__imul__", "__ipow__"]
)
@pytest.mark.parametrize("inplace", [False, True])
@pytest.mark.parametrize(
"inplace",
[
False,
pytest.param(True, marks=pytest.mark.xfail(reason="reverted - GH36373")),
],
)
def test_inplace_drop_and_operation(self, operation, inplace):
# GH#30484
df = DataFrame({"x": range(5)})
Expand Down
9 changes: 9 additions & 0 deletions pandas/tests/frame/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,3 +1698,12 @@ def test_arith_list_of_arraylike_raise(to_add):
df + to_add
with pytest.raises(ValueError, match=msg):
to_add + df


def test_inplace_arithmetic_series_update():
# https://github.com/pandas-dev/pandas/issues/36373
df = DataFrame({"A": [1, 2, 3]})
series = df["A"]
series += 1
expected = DataFrame({"A": [2, 3, 4]})
tm.assert_frame_equal(df, expected)
1 change: 1 addition & 0 deletions pandas/tests/indexing/test_loc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,7 @@ def test_identity_slice_returns_new_object(self):
original_series[:3] = [7, 8, 9]
assert all(sliced_series[:3] == [7, 8, 9])

@pytest.mark.xfail(reason="accidental fix reverted - GH37497")
def test_loc_copy_vs_view(self):
Copy link
Member

Choose a reason for hiding this comment

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

im inclined to think this test is wrong.

orig = DataFrame(zip(range(3), range(3)), columns=["a", "b"])
df = orig.copy()

ser = df.loc[:, "a"]
ser += 2

tm.assert_frame_equal(df, orig)

df.loc[:, "a"] is a view on df, and += is specifically an inplace op (as long as it doesnt result in a dtype change). I think df should be altered.

Copy link
Member Author

Choose a reason for hiding this comment

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

im inclined to think this test is wrong.

Yep, I had the same feeling: #36498 (comment)

# GH 15631
x = DataFrame(zip(range(3), range(3)), columns=["a", "b"])
Expand Down