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

BUG: set index of DataFrame.apply(f) when f returns dict (#37544) #37606

Merged
merged 3 commits into from
Nov 4, 2020
Merged

BUG: set index of DataFrame.apply(f) when f returns dict (#37544) #37606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3758a9b
BUG: set index of DataFrame.apply(f) when f returns dict (#37544)
ma3da Nov 3, 2020
eb6905c
BUG: set index of DataFrame.apply(f) when f returns dict
ma3da Nov 4, 2020
54c0465
Merge remote-tracking branch 'upstream/master' into GH_37544
ma3da Nov 4, 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.2.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,7 @@ Reshaping
- Bug in :func:`join` returned a non deterministic level-order for the resulting :class:`MultiIndex` (:issue:`36910`)
- Bug in :meth:`DataFrame.combine_first()` caused wrong alignment with dtype ``string`` and one level of ``MultiIndex`` containing only ``NA`` (:issue:`37591`)
- Fixed regression in :func:`merge` on merging DatetimeIndex with empty DataFrame (:issue:`36895`)
- Bug in :meth:`DataFrame.apply` not setting index of return value when ``func`` return type is ``dict`` (:issue:`37544`)

Sparse
^^^^^^
Expand Down
6 changes: 4 additions & 2 deletions pandas/core/apply.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,10 @@ def wrap_results_for_axis(
isinstance(x, dict) for x in results.values()
):
# Our operation was a to_dict op e.g.
# test_apply_dict GH#8735, test_apply_reduce_rows_to_dict GH#25196
return self.obj._constructor_sliced(results)
# test_apply_dict GH#8735, test_apply_reduce_to_dict GH#25196 #37544
res = self.obj._constructor_sliced(results)
res.index = res_index
return res

try:
result = self.obj._constructor(data=results)
Expand Down
17 changes: 11 additions & 6 deletions pandas/tests/frame/apply/test_frame_apply.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,17 @@ def test_apply_reduce_Series(self, float_frame):
result = float_frame.apply(np.mean, axis=1)
tm.assert_series_equal(result, expected)

def test_apply_reduce_rows_to_dict(self):
# GH 25196
data = DataFrame([[1, 2], [3, 4]])
expected = Series([{0: 1, 1: 3}, {0: 2, 1: 4}])
result = data.apply(dict)
tm.assert_series_equal(result, expected)
def test_apply_reduce_to_dict(self):
# GH 25196 37544
data = DataFrame([[1, 2], [3, 4]], columns=["c0", "c1"], index=["i0", "i1"])

result0 = data.apply(dict, axis=0)
expected0 = Series([{"i0": 1, "i1": 3}, {"i0": 2, "i1": 4}], index=data.columns)
tm.assert_series_equal(result0, expected0)

result1 = data.apply(dict, axis=1)
expected1 = Series([{"c0": 1, "c1": 2}, {"c0": 3, "c1": 4}], index=data.index)
tm.assert_series_equal(result1, expected1)

def test_apply_differently_indexed(self):
df = DataFrame(np.random.randn(20, 10))
Expand Down