Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
2c761eb
REF: setitem_with_indexer always use same path for 2D
jbrockmendel Dec 28, 2020
d207a12
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Jan 6, 2021
f0dae4d
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Jan 8, 2021
27bd89d
fixed xfail
jbrockmendel Jan 8, 2021
a5c1f5e
REF: DataFrame._setitem_array dont use iloc.__setitem__
jbrockmendel Jan 27, 2021
15f5265
REF: DataFrame._setitem_array dont use iloc.__setitem__
jbrockmendel Jan 31, 2021
73302c0
Merge branch 'master' of https://github.com/pandas-dev/pandas into se…
jbrockmendel Jan 31, 2021
ceeeb78
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Jan 31, 2021
6b304b8
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 2, 2021
fe9be7e
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 2, 2021
1789fca
mypy fixup
jbrockmendel Feb 2, 2021
6400be3
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 2, 2021
a1cdd19
mypy fixup
jbrockmendel Feb 2, 2021
870ae37
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 2, 2021
c32a427
32bit compat
jbrockmendel Feb 2, 2021
d9d8beb
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 2, 2021
8a283d9
troubleshoot windows builds
jbrockmendel Feb 2, 2021
9718f6e
Merge branch 'master' of https://github.com/pandas-dev/pandas into se…
jbrockmendel Feb 3, 2021
9f6d8e7
troubleshoot 32bit
jbrockmendel Feb 3, 2021
dd53abc
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 3, 2021
f6b09b4
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 7, 2021
c107e77
TST: missed raising cases
jbrockmendel Feb 7, 2021
ae3ae1b
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 18, 2021
c631079
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 23, 2021
4cfe863
port phofl tests
jbrockmendel Feb 23, 2021
03e6eb9
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 25, 2021
d280f60
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 26, 2021
9db5537
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 27, 2021
4054aea
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Feb 27, 2021
bd76479
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Mar 4, 2021
7ea792f
whatsnew
jbrockmendel Mar 4, 2021
20f6a16
clarify whatsnew
jbrockmendel Mar 4, 2021
b9daceb
merge but not passing...
jbrockmendel Mar 5, 2021
6117e8e
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 5, 2021
94b33a8
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 5, 2021
8f71f27
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 5, 2021
17049e4
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 6, 2021
fdbf6f3
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Mar 7, 2021
f8363f9
Merge branch 'setitem-frame-no-defer' into ref-indexing-2
jbrockmendel Mar 7, 2021
2c6da5d
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Mar 8, 2021
2d0cf9e
comment
jbrockmendel Mar 8, 2021
e1ed083
whatsnew
jbrockmendel Mar 8, 2021
df9d87f
checkpoint passing
jbrockmendel Mar 9, 2021
aeb687c
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 9, 2021
481ece1
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 9, 2021
95f34c8
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 11, 2021
be54f15
Fix dtype in loc-setitem-with-expansion
jbrockmendel Mar 11, 2021
6896e86
Merge branch 'master' into setitem-frame-no-defer
jbrockmendel Mar 12, 2021
b183084
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 12, 2021
fa2006b
ArrayManager compat
jbrockmendel Mar 12, 2021
1af8686
xfail only for BM
jbrockmendel Mar 13, 2021
301d582
Merge branch 'setitem-frame-no-defer' into ref-indexing-2
jbrockmendel Mar 13, 2021
1d24f71
mypy fixup
jbrockmendel Mar 13, 2021
d8c7c4c
special case ArrayManager
jbrockmendel Mar 13, 2021
f0037e6
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 15, 2021
094e47d
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 17, 2021
6791a97
ArrayManager compat
jbrockmendel Mar 17, 2021
d01951d
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 22, 2021
01ff673
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 24, 2021
8e8e711
arraymanager compat for tests
jbrockmendel Mar 24, 2021
18d72ec
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 31, 2021
ba1d17c
Merge branch 'master' into ref-indexing-2
jbrockmendel Mar 31, 2021
1fca2d5
Merge branch 'master' into ref-indexing-2
jbrockmendel Apr 1, 2021
1382985
Merge branch 'master' into ref-indexing-2
jbrockmendel Apr 2, 2021
10ab24d
merge master
jbrockmendel Apr 2, 2021
8e5a414
Merge branch 'master' into ref-indexing-2
jbrockmendel Apr 3, 2021
cdfc811
Merge branch 'master' into ref-indexing-2
jbrockmendel Apr 7, 2021
d761df6
Merge branch 'master' into ref-indexing-2
jbrockmendel Apr 12, 2021
b4d0211
Merge branch 'master' into ref-indexing-2
jbrockmendel Apr 16, 2021
53be486
Merge branch 'master' into ref-indexing-2
jbrockmendel May 10, 2021
05107a2
Merge branch 'master' into ref-indexing-2
jbrockmendel May 12, 2021
b87fc55
Merge branch 'master' into ref-indexing-2
jbrockmendel Jun 4, 2021
3279159
Merge branch 'master' into ref-indexing-2
jbrockmendel Jun 16, 2021
9f7e274
Merge branch 'master' into ref-indexing-2
jbrockmendel Jun 24, 2021
a4aed44
Merge branch 'master' into ref-indexing-2
jbrockmendel Jul 24, 2021
e1c30fa
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Jul 29, 2021
e062dce
Merge branch 'master' into ref-indexing-2
jbrockmendel Jul 30, 2021
9a73ef6
update incorrect tests
jbrockmendel Jul 30, 2021
4a9919b
Merge remote-tracking branch 'upstream/master' into ref-indexing-2
jbrockmendel Jul 30, 2021
8761ffa
docstring, comment
jbrockmendel Jul 31, 2021
99e3316
Merge remote-tracking branch 'upstream/master' into ref-indexing-2
jbrockmendel Jul 31, 2021
be22a99
Merge branch 'master' into ref-indexing-2
jbrockmendel Aug 4, 2021
86d3e71
Merge branch 'master' into ref-indexing-2
jbrockmendel Aug 17, 2021
d49512b
Merge branch 'master' into ref-indexing-2
jbrockmendel Aug 23, 2021
d821e8b
REF: implement mask_setitem_value
jbrockmendel Sep 18, 2021
f142f16
Merge branch 'master' into ref-indexing-2
jbrockmendel Sep 18, 2021
eccfebb
Merge branch 'ref-indexing-bool' into ref-indexing-2
jbrockmendel Sep 18, 2021
0c430c9
Merge branch 'master' into ref-indexing-2
jbrockmendel Sep 30, 2021
295737e
Merge branch 'master' into ref-indexing-2
jbrockmendel Oct 4, 2021
405b21f
Merge branch 'master' into ref-indexing-2
jbrockmendel Oct 19, 2021
520230c
Merge branch 'master' into ref-indexing-2
jbrockmendel Oct 19, 2021
0ac5516
fix last tesst
jbrockmendel Oct 19, 2021
7a46ab8
Merge branch 'master' into ref-indexing-2
jbrockmendel Oct 31, 2021
b19a787
Merge branch 'master' into ref-indexing-2
jbrockmendel Nov 1, 2021
7bf721b
Merge branch 'master' into ref-indexing-2
jbrockmendel Nov 1, 2021
7db1a5a
ArrayManager cases
jbrockmendel Nov 1, 2021
ca0f516
Merge branch 'master' into ref-indexing-2
jbrockmendel Nov 7, 2021
3b456f9
remove _isetitem
jbrockmendel Nov 7, 2021
1e4b617
Merge branch 'master' into ref-indexing-2
jbrockmendel Nov 9, 2021
1d203a6
Merge branch 'master' into ref-indexing-2
jbrockmendel Nov 29, 2021
4e69970
fixup missing fixture
jbrockmendel Nov 29, 2021
0a0e712
un-xfail for ArrayManager
jbrockmendel Nov 30, 2021
4ce2cd3
fix incorrect test
jbrockmendel Nov 30, 2021
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 'master' into ref-indexing-2
  • Loading branch information
jbrockmendel committed Mar 12, 2021
commit b183084a2e96636cdafdc95b648ceb9e683f1a1b
1 change: 1 addition & 0 deletions pandas/core/internals/managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1505,6 +1505,7 @@ def take(self: T, indexer, axis: int = 1, verify: bool = True) -> T:
-------
BlockManager
"""
# We have 6 tests that get here with a slice
# TODO: should these be np.intp?
indexer = (
np.arange(indexer.start, indexer.stop, indexer.step, dtype="int64")
Expand Down
15 changes: 12 additions & 3 deletions pandas/tests/frame/indexing/test_setitem.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,9 +387,18 @@ def test_setitem_frame_duplicate_columns(self, using_array_manager):
],
dtype="object",
)
expected[2] = expected[2].astype(np.int64)
expected[5] = expected[5].astype(np.int64)
expected.columns = cols
if using_array_manager:
expected.columns = cols
# setitem replaces column so changes dtype
expected["C"] = expected["C"].astype("int64")
# TODO(ArrayManager) .loc still overwrites
expected["B"] = expected["B"].astype("int64")
else:
# do this setting with unique columns to be on the safe side
expected[2] = expected[2].astype(np.int64)
expected[5] = expected[5].astype(np.int64)
expected.columns = cols

tm.assert_frame_equal(df, expected)

def test_setitem_frame_duplicate_columns_size_mismatch(self):
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.