10000 ENH: Add dropna in groupby to allow NaN in keys by charlesdong1991 · Pull Request #30584 · pandas-dev/pandas · GitHub
[go: up one dir, main page]

Skip to content

ENH: Add dropna in groupby to allow NaN in keys #30584

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.

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

Merged
merged 59 commits into from
May 9, 2020
Merged
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
7e461a1
remove \n from docstring
charlesdong1991 Dec 3, 2018
1314059
fix conflicts
charlesdong1991 Jan 19, 2019
8bcb313
Merge remote-tracking branch 'upstream/master'
charlesdong1991 Jul 30, 2019
13b03a8
Merge remote-tracking branch 'upstream/master' into fix_issue_3729
charlesdong1991 Dec 31, 2019
98f6127
fix issue 3729
charlesdong1991 Dec 31, 2019
d5fd74c
fix conflicts
charlesdong1991 Dec 31, 2019
eb717ec
not check type
charlesdong1991 Dec 31, 2019
de2ee5d
Add groupby test for Series
charlesdong1991 Dec 31, 2019
def05cc
Add whatsnew note
charlesdong1991 Dec 31, 2019
2888807
Code change based on JR review
charlesdong1991 Jan 1, 2020
b357659
fix conflicts
charlesdong1991 Jan 1, 2020
dc4fef1
add forgotten commits
charlesdong1991 Jan 1, 2020
25482ec
add forgotten commit
charlesdong1991 Jan 1, 2020
015336d
Add dropna for series
charlesdong1991 Jan 1, 2020
ac2a79f
add doc example for Series
charlesdong1991 Jan 1, 2020
eb9a6f7
Add level example for series groupby
charlesdong1991 Jan 1, 2020
ffb70f8
Add doc example for frame groupby
charlesdong1991 Jan 1, 2020
8000 b0e3cce
Code change based on JR reviews
charlesdong1991 Jan 2, 2020
a1d5510
add doc
charlesdong1991 Jan 2, 2020
11ef56a
move doc
charlesdong1991 Jan 2, 2020
b247a8b
NaN to NA
charlesdong1991 Jan 2, 2020
7cb027c
Merge remote-tracking branch 'upstream/master' into fix_issue_3729
charlesdong1991 Jan 2, 2020
d730c4a
Fix linting
charlesdong1991 Jan 2, 2020
42c4934
fix rst issue
charlesdong1991 Jan 2, 2020
2ba79b9
fix rst issue
charlesdong1991 Jan 2, 2020
8b79b6c
refactor based on WA review
charlesdong1991 Jan 3, 2020
a4fdf2d
merge master and resolve conflicts
charlesdong1991 Feb 10, 2020
4ac15e3
remove blank
charlesdong1991 Feb 10, 2020
4ebbad3
code change on reviews
charlesdong1991 Feb 10, 2020
f141b80
use pd.testing
charlesdong1991 Feb 10, 2020
23ad19b
linting
charlesdong1991 Feb 10, 2020
bafc4a5
fixup
charlesdong1991 Feb 10, 2020
c98bafe
fixup
charlesdong1991 Feb 10, 2020
86a5958
doc
charlesdong1991 Feb 10, 2020
6cf31d7
validation
charlesdong1991 Feb 10, 2020
2b77f37
xfail windows
charlesdong1991 Feb 10, 2020
451ec97
rebase and resolve conflict
charlesdong1991 Feb 19, 2020
1089b18
fixup based on WA review
charlesdong1991 Feb 22, 2020
63da563
Merge remote-tracking branch 'upstream/master' into fix_issue_3729
charlesdong1991 Feb 22, 2020
1b3f22a
fix conflicts
charlesdong1991 Apr 7, 2020
3f360a9
reduce tests
charlesdong1991 Apr 7, 2020
5cabe4b
fix pep8
charlesdong1991 Apr 7, 2020
76ffb9f
Merge remote-tracking branch 'upstream/master' into fix_issue_3729
charlesdong1991 Apr 11, 2020
6c126c7
rebase and docs fixes
charlesdong1991 Apr 11, 2020
6d61d6a
fixup doc
charlesdong1991 Apr 11, 2020
3630e8b
remove inferred type
charlesdong1991 Apr 11, 2020
1cec7f1
better comment
charlesdong1991 Apr 11, 2020
1a1bb49
remove xfail
charlesdong1991 Apr 11, 2020
7ea2e79
use fixture
charlesdong1991 Apr 11, 2020
13b1e9a
coelse type for windows build
charlesdong1991 Apr 11, 2020
92a7eed
fixup
charlesdong1991 Apr 11, 2020
1315a9d
fixup
charlesdong1991 Apr 11, 2020
a7959d5
Merge remote-tracking branch 'upstream/master' into fix_issue_3729
charlesdong1991 Apr 15, 2020
9fec9a8
Merge remote-tracking branch 'upstream/master' into fix_issue_3729
charlesdong1991 Apr 27, 2020
ffbae76
Doc fixup
charlesdong1991 Apr 27, 2020
ef90d7c
Merge remote-tracking branch 'upstream/master' into fix_issue_3729
charlesdong1991 Apr 27, 2020
e219748
rebase and resolve conflict
charlesdong1991 Apr 27, 2020
2940908
Merge remote-tracking branch 'upstream/master' into fix_issue_3729
charlesdong1991 May 7, 2020
4ea6aa0
try merge master again
charlesdong1991 May 7, 2020
File filter

Filter by extension

8000
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
add doc example for Series
  • Loading branch information
charlesdong1991 committed Jan 1, 2020
commit ac2a79f51a37307a67d16aed4f5b7c6ccb611a8b
34 changes: 30 additions & 4 deletions pandas/core/series.py
Original file line number Diff line number Diff line change
Expand Up @@ -1433,7 +1433,7 @@ def to_string(
@Substitution(klass="Series")
@Appender(generic._shared_docs["to_markdown"])
def to_markdown(
self, buf: Optional[IO[str]] = None, mode: Optional[str] = None, **kwargs,
self, buf: Optional[IO[str]] = None, mode: Optional[str] = None, **kwargs
) -> Optional[str]:
return self.to_frame().to_markdown(buf, mode, **kwargs)

Expand Down Expand Up @@ -1620,6 +1620,34 @@ def _set_name(self, name, inplace=False):
Captive 210.0
Wild 185.0
Name: Max Speed, dtype: float64

We can also choose to include NaN in group keys or not by defining
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mention the default value

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mentioned

`dropna` parameter:

>>> ser = pd.Series([1, 2, 3, 3], index=["a", 'a', 'b', np.nan])
>>> ser.groupby(level=0).sum()
a 3
b 3
dtype: int64

>>> ser.groupby(level=0, dropna=False).sum()
a 3
b 3
NaN 3
dtype: int64

>>> arrays = ['Falcon', 'Falcon', 'Parrot', 'Parrot']
>>> ser = pd.Series([390., 350., 30., 20.], index=arrays, name="Max Speed")
>>> ser.groupby(["a", "b", "a", np.nan]).mean()
a 210.0
b 350.0
Name: Max Speed, dtype: float64

>>> ser.groupby(["a", "b", "a", np.nan], dropna=False).mean()
a 210.0
b 350.0
NaN 20.0
Name: Max Speed, dtype: float64
"""
)
@Appender(generic._shared_docs["groupby"] % _shared_doc_kwargs)
Expand Down Expand Up @@ -4480,9 +4508,7 @@ def to_period(self, freq=None, copy=True):
hist = pandas.plotting.hist_series


Series._setup_axes(
["index"], docs={"index": "The index (axis labels) of the Series."},
)
Series._setup_axes(["index"], docs={"index": "The index (axis labels) of the Series."})
Series._add_numeric_operations()
Series._add_series_or_dataframe_operations()

Expand Down
0