8000 BUG: fixed issue with mixed type groupby aggregate by nreeve17 · Pull Request #17003 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

BUG: fixed issue with mixed type groupby aggregate #17003

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

Closed
wants to merge 11 commits into from
Closed

BUG: fixed issue with mixed type groupby aggregate #17003

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4c9e32d
BUG: fixed issue with mixed type groupby aggregate
Jul 18, 2017
a58de54
Addressing review comments from PR issue16916
Jul 19, 2017
dbbb0d4
Merge branch 'master' into issue16916
Jul 19, 2017
7b24ee1
Merge branch 'master' of https://github.com/pandas-dev/pandas into is…
Jul 21, 2017
a7a20d5
DOC: Fix incorrect merge conflict
Jul 28, 2017
34ca8d8
used safe_sort in groupby.py
Aug 4, 2017
ba57c26
Merge branch 'master' of https://github.com/pandas-dev/pandas into is…
Aug 4, 2017
b634bc9
re-added bug fix at line 281
Aug 4, 2017
89c585b
DOC: Correct release notes
ElDeveloper Aug 6, 2017
0391dfd
Merge pull request #1 from ElDeveloper/issue16916
Aug 6, 2017
4a2dfba
Merge branch 'master' into issue16916
Sep 26, 2017
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
used safe_sort in groupby.py
  • Loading branch information
Nicolai Reeve committed Aug 4, 2017
commit 34ca8d891b0b4cb23623aaff8a9b20ebe1925e9d
8 changes: 2 additions & 6 deletions pandas/core/groupby.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
from pandas.io.formats.printing import pprint_thing
from pandas.util._validators import validate_kwargs

from pandas.core.sorting import safe_sort
import pandas.core.algorithms as algorithms
import pandas.core.common as com
from pandas.core.config import option_context
Expand Down Expand Up @@ -2883,12 +2884,7 @@ def aggregate(self, func_or_funcs, *args, **kwargs):
except Exception:
result = self._aggregate_named(func_or_funcs, *args, **kwargs)

# mixed types fail to sort
try:
values = sorted(result)
except TypeError:
values = result
index = Index(values, name=self.grouper.names[0])
index = Index(safe_sort(result), name=self.grouper.names[0])
ret = Series(result, index=index)

if not self.as_index: # pragma: no cover
Expand Down
0