Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9c8bafb
DEPR: df.iloc[:, foo] = bar attempt to set inplace
jbrockmendel Jan 12, 2022
67caa09
Merge branch 'main' into depr-isetitem
jbrockmendel Jan 16, 2022
d70cbdb
Merge branch 'main' into depr-isetitem
jbrockmendel Jan 17, 2022
ee4c0d2
doc fixup
jbrockmendel Jan 17, 2022
5102fbf
Merge branch 'main' into depr-isetitem
jbrockmendel Jan 19, 2022
48309bb
Merge branch 'main' into depr-isetitem
jbrockmendel Jan 19, 2022
ab87ef0
ArrayManager warnings
jbrockmendel Jan 19, 2022
65dddf2
Merge branch 'main' into depr-isetitem
jbrockmendel Jan 29, 2022
5ef3d38
merge main
jbrockmendel Feb 1, 2022
dcbf2f1
implement isetitem
jbrockmendel Feb 1, 2022
17c1efd
Merge branch 'main' into depr-isetitem
jbrockmendel Feb 5, 2022
5b05bab
Merge branch 'main' into depr-isetitem
jbrockmendel Feb 15, 2022
b8e9344
fix test
jbrockmendel Feb 15, 2022
f2b119f
whatsnew
jbrockmendel Feb 15, 2022
85449df
Merge branch 'main' into depr-isetitem
jbrockmendel Feb 16, 2022
048d777
Fix test for ArrayManager
jbrockmendel Feb 16, 2022
90d5150
Merge branch 'main' into depr-isetitem
jbrockmendel Feb 17, 2022
261a33a
Merge branch 'main' into depr-isetitem
jbrockmendel Feb 17, 2022
4d4ba5c
fix test with arrayManager
jbrockmendel Feb 17, 2022
5bf9a52
Merge branch 'main' into depr-isetitem
jbrockmendel Feb 28, 2022
2417c76
Merge branch 'main' into depr-isetitem
jbrockmendel Mar 1, 2022
8d9d9ff
Merge branch 'main' into depr-isetitem
jbrockmendel Mar 15, 2022
f549015
Merge branch 'main' into depr-isetitem
jbrockmendel Apr 11, 2022
eb2c98d
Merge branch 'main' into depr-isetitem
jbrockmendel May 2, 2022
709afde
Merge branch 'main' into depr-isetitem
jbrockmendel May 12, 2022
4e5c65d
empty commit to force CI
jbrockmendel May 13, 2022
d4332b7
Merge branch 'main' into depr-isetitem
jbrockmendel May 13, 2022
4d02c57
Merge branch 'main' into depr-isetitem
jbrockmendel May 23, 2022
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
Prev Previous commit
Next Next commit
Merge branch 'main' into depr-isetitem
  • Loading branch information
jbrockmendel committed Mar 1, 2022
commit 2417c76a93a51b0c7188f1721882b0883612a27b
6 changes: 6 additions & 0 deletions pandas/tests/extension/base/setitem.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,12 @@ def test_setitem_frame_2d_values(self, data):
data.dtype, (PandasDtype, PeriodDtype, IntervalDtype, DatetimeTZDtype)
)

# Avoiding using_array_manager fixture
# https://github.com/pandas-dev/pandas/pull/44514#discussion_r754002410
using_array_manager = isinstance(df._mgr, pd.core.internals.ArrayManager)

blk_data = df._mgr.arrays[0]

orig = df.copy()

msg = "will attempt to set the values inplace instead"
Expand Down
1 change: 1 addition & 0 deletions pandas/tests/indexing/test_iloc.py
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@ def test_iloc_setitem_categorical_updates_inplace(self):
msg = "will attempt to set the values inplace instead"
with tm.assert_produces_warning(FutureWarning, match=msg):
df.iloc[:, 0] = cat[::-1]
assert tm.shares_memory(df[1], cat)

expected = Categorical(["C", "B", "A"], categories=["A", "B", "C"])
tm.assert_categorical_equal(cat, expected)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.