FIX-#1674: Series.apply and DataFrame.apply #1718
Merged
Conversation
This file contains 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
5 tasks
|
|
|
amyskov
force-pushed
the
series_apply
branch
2 times, most recently
from
e796d25
to
01fde66
Compare
Codecov Report
@@ Coverage Diff @@
## master #1718 +/- ##
==========================================
+ Coverage 81.39% 81.46% +0.06%
==========================================
Files 79 79
Lines 9165 9172 +7
==========================================
+ Hits 7460 7472 +12
+ Misses 1705 1700 -5
Continue to review full report at Codecov.
|
|
@amyskov plz rebase from master |
amyskov
force-pushed
the
series_apply
branch
2 times, most recently
from
2eed5e4
to
982e2d3
Compare
amyskov
changed the title
modin/pandas/series.py
Outdated
| @@ -516,7 +523,10 @@ def f(x): | |||
| return f(self) | |||
| query_compiler = self.map(f)._query_compiler | |||
| if return_type not in ["DataFrame", "Series"]: | |||
| return query_compiler.to_pandas().squeeze() | |||
| try: | |||
| return query_compiler.to_pandas().squeeze() | |||
There was a problem hiding this comment.
When does this throw an Exception?
There was a problem hiding this comment.
It can throws an Exception in the case if result of applying of function is not a query_compiler, but scalar (such result can occurs for sum or count functions, for example). This expression was reworked to explicitly check result type and corresponding comment is added.
amyskov
force-pushed
the
series_apply
branch
2 times, most recently
from
59e3a5d
to
c03ae36
Compare
amyskov
force-pushed
the
series_apply
branch
5 times, most recently
from
3b058c3
to
dc68a11
Compare
Signed-off-by: Alexander Myskov <alexander.myskov@intel.com>
Signed-off-by: Alexander Myskov <alexander.myskov@intel.com>
Signed-off-by: Alexander Myskov <alexander.myskov@intel.com>
Signed-off-by: Alexander Myskov <alexander.myskov@intel.com>
Signed-off-by: Alexander Myskov <alexander.myskov@intel.com>
Signed-off-by: Alexander Myskov <alexander.myskov@intel.com>
devin-petersohn
approved these changes
Aug 4, 2020
aregm
pushed a commit
to aregm/modin
that referenced
this pull request
Sep 16, 2020
…ct#1718) Signed-off-by: Alexander Myskov <alexander.myskov@intel.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What do these changes do?
Series.apply and DataFrame.apply functions are reworked in order to match Pandas behavior.
flake8 modinblack --check modingit commit -sSeries.apply("array")doesn't work if Series contains one element #1674