-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
BUG: Fix DataFrame.apply for string arg with additional args (#22376) #22377
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
jreback
merged 5 commits into
pandas-dev:master
from
megabyde:fix-apply-string-func-with-args
Aug 23, 2018
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4b1d5b5
BUG: Fix DataFrame.apply for string arg with additional args (#22376)
megabyde a051592
Add tests for args and kwargs combinations
megabyde 149bbae
Merge remote-tracking branch 'upstream/master' into fix-apply-string-…
megabyde 3ca2017
Merge branch 'master' into PR_TOOL_MERGE_PR_22377
jreback 48d283a
lint
jreback File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -121,13 +121,10 @@ def test_apply_standard_nonunique(self): | |
assert_series_equal(rs, xp) | ||
|
||
@pytest.mark.parametrize('arg', ['sum', 'mean', 'min', 'max', 'std']) | ||
def test_with_string_args(self, arg): | ||
result = self.frame.apply(arg) | ||
expected = getattr(self.frame, arg)() | ||
tm.assert_series_equal(result, expected) | ||
|
||
result = self.frame.apply(arg, axis=1) | ||
expected = getattr(self.frame, arg)(axis=1) | ||
@pytest.mark.parametrize('kwds', [{}, {'axis': 1}, {'numeric_only': True}]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you add a test for just std that adds both a positional arg (e.g. ddof) and a kwarg (numeric_only) for confirmation here (and other combinations if possible) |
||
def test_with_string_args(self, arg, kwds): | ||
result = self.frame.apply(arg, **kwds) | ||
expected = getattr(self.frame, arg)(**kwds) | ||
tm.assert_series_equal(result, expected) | ||
|
||
def test_apply_broadcast_deprecated(self): | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you format this like
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jreback The formatting you propose makes Flake complaining: