Skip to content

Commit 0752e59

Browse files
committed
Merge with latest, and fix tests related to bug fix
1 parent 2933f34 commit 0752e59

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

doc/source/whatsnew/v0.24.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,6 +1315,7 @@ Reshaping
13151315
- Bug in :func:`pandas.concat` when concatenating a multicolumn DataFrame with tz-aware data against a DataFrame with a different number of columns (:issue`22796`)
13161316
- Bug in :func:`merge_asof` where confusing error message raised when attempting to merge with missing values (:issue:`23189`)
13171317
- Bug in :meth:`DataFrame.nsmallest` and :meth:`DataFrame.nlargest` for dataframes that have :class:`MultiIndex`ed columns (:issue:`23033`).
1318+
- Bug in :meth:`DataFrame.join` when joining on partial MultiIndex would drop names (:issue:`20452`).
13181319

13191320
.. _whatsnew_0240.bug_fixes.sparse:
13201321

pandas/tests/reshape/merge/test_merge.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,16 +1913,16 @@ def test_merge_index_types(index):
19131913
assert_frame_equal(result, expected)
19141914

19151915

1916-
@pytest.mark.parametrize("on,left_on,right_on,left_index,right_index,nms,nm", [
1917-
(['outer', 'inner'], None, None, False, False, ['outer', 'inner'], 'B'),
1918-
(None, None, None, True, True, ['outer', 'inner'], 'B'),
1919-
(None, ['outer', 'inner'], None, False, True, None, 'B'),
1920-
(None, None, ['outer', 'inner'], True, False, None, 'B'),
1921-
(['outer', 'inner'], None, None, False, False, ['outer', 'inner'], None),
1922-
(None, None, None, True, True, ['outer', 'inner'], None),
1923-
(None, ['outer', 'inner'], None, False, True, None, None),
1924-
(None, None, ['outer', 'inner'], True, False, None, None)])
1925-
def test_merge_series(on, left_on, right_on, left_index, right_index, nms, nm):
1916+
@pytest.mark.parametrize("on,left_on,right_on,left_index,right_index,nm", [
1917+
(['outer', 'inner'], None, None, False, False, 'B'),
1918+
(None, None, None, True, True, 'B'),
1919+
(None, ['outer', 'inner'], None, False, True, 'B'),
1920+
(None, None, ['outer', 'inner'], True, False, 'B'),
1921+
(['outer', 'inner'], None, None, False, False, None),
1922+
(None, None, None, True, True, None),
1923+
(None, ['outer', 'inner'], None, False, True, None),
1924+
(None, None, ['outer', 'inner'], True, False, None)])
1925+
def test_merge_series(on, left_on, right_on, left_index, right_index, nm):
19261926
# GH 21220
19271927
a = pd.DataFrame({"A": [1, 2, 3, 4]},
19281928
index=pd.MultiIndex.from_product([['a', 'b'], [0, 1]],
@@ -1932,7 +1932,7 @@ def test_merge_series(on, left_on, right_on, left_index, right_index, nms, nm):
19321932
names=['outer', 'inner']), name=nm)
19331933
expected = pd.DataFrame({"A": [2, 4], "B": [1, 3]},
19341934
index=pd.MultiIndex.from_product([['a', 'b'], [1]],
1935-
names=nms))
1935+
names=['outer', 'inner']))
19361936
if nm is not None:
19371937
result = pd.merge(a, b, on=on, left_on=left_on, right_on=right_on,
19381938
left_index=left_index, right_index=right_index)

0 commit comments

Comments
 (0)