-
-
Couldn't load subscription status.
- Fork 19.2k
BUG: DataFrame.rank does not return EA types when original type was an EADtype #62189
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
Open
sharkipelago wants to merge 14 commits into pandas-dev:main Choose a base branch from sharkipelago:frame-rank-extension-array
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
+116 −18
Open
Changes from 11 commits
Commits
Show all changes
14 commits Select commit Hold shift + click to select a range
98a70df using _mgr apply with 2 failing tests
sharkipelago af9f3de transposed blocks to keep axis_int parameter intact
sharkipelago 00ef2ea added rst
sharkipelago f78ffa5 updated rst
sharkipelago 5124513 Merge remote-tracking branch 'upstream/main' into frame-rank-extensio…
sharkipelago 178f4e3 dataframe level transpose
sharkipelago 3a94c7f Merge remote-tracking branch 'upstream/main' into frame-rank-extensio…
sharkipelago 94893f0 removed redundant ndim checks
sharkipelago 7ee79ef added pytest skips if no pyarrow module
sharkipelago 601dc39 Merge remote-tracking branch 'upstream/main' into frame-rank-extensio…
sharkipelago 2e7ca27 corrected to dtype_backend
sharkipelago 011c293 Merge remote-tracking branch 'upstream/main' into frame-rank-extensio…
sharkipelago 15922e8 Merge remote-tracking branch 'upstream/main' into frame-rank-extensio…
sharkipelago fce155a 2d extension arrays
sharkipelago 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| | @@ -1088,7 +1088,6 @@ def rank( | |
| ) | ||
| else: | ||
| raise TypeError("Array with ndim > 2 are not supported.") | ||
| | ||
| return ranks | ||
| | ||
| | ||
| | ||
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 |
|---|---|---|
| | @@ -2408,6 +2408,7 @@ def _rank( | |
| """ | ||
| See Series.rank.__doc__. | ||
| """ | ||
| | ||
| if axis != 0: | ||
| raise NotImplementedError | ||
| | ||
| | ||
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 |
|---|---|---|
| | @@ -9276,34 +9276,35 @@ def rank( | |
| msg = "na_option must be one of 'keep', 'top', or 'bottom'" | ||
| raise ValueError(msg) | ||
| | ||
| def ranker(data): | ||
| if data.ndim == 2: | ||
| # i.e. DataFrame, we cast to ndarray | ||
| values = data.values | ||
| else: | ||
| # i.e. Series, can dispatch to EA | ||
| values = data._values | ||
| | ||
| if isinstance(values, ExtensionArray): | ||
| ranks = values._rank( | ||
| axis=axis_int, | ||
| def ranker(blk_values): | ||
| if isinstance(blk_values, ExtensionArray) and blk_values.ndim == 1: | ||
| ||
| ranks = blk_values._rank( | ||
| axis=0, | ||
| method=method, | ||
| ascending=ascending, | ||
| na_option=na_option, | ||
| pct=pct, | ||
| ) | ||
| else: | ||
| ranks = algos.rank( | ||
| values, | ||
| axis=axis_int, | ||
| method=method, | ||
| ascending=ascending, | ||
| na_option=na_option, | ||
| pct=pct, | ||
| ) | ||
| | ||
| ranks_obj = self._constructor(ranks, **data._construct_axes_dict()) | ||
| return ranks_obj.__finalize__(self, method="rank") | ||
| if axis_int == 0: | ||
| ranks = algos.rank( | ||
| blk_values.T, | ||
| axis=axis_int, | ||
| method=method, | ||
| ascending=ascending, | ||
| na_option=na_option, | ||
| pct=pct, | ||
| ).T | ||
| else: | ||
| ranks = algos.rank( | ||
| blk_values, | ||
| axis=axis_int, | ||
| method=method, | ||
| ascending=ascending, | ||
| na_option=na_option, | ||
| pct=pct, | ||
| ) | ||
| return ranks | ||
| | ||
| if numeric_only: | ||
| if self.ndim == 1 and not is_numeric_dtype(self.dtype): | ||
| | @@ -9316,7 +9317,16 @@ def ranker(data): | |
| else: | ||
| data = self | ||
| | ||
| return ranker(data) | ||
| should_transpose = axis_int == 1 | ||
| | ||
| if should_transpose: | ||
| data = data.T | ||
| applied = data._mgr.apply(ranker) | ||
| result = self._constructor_from_mgr(applied, axes=applied.axes) | ||
| if should_transpose: | ||
| result = result.T | ||
| | ||
| return result.__finalize__(self, method="rank") | ||
| | ||
| @doc(_shared_docs["compare"], klass=_shared_doc_kwargs["klass"]) | ||
| def compare( | ||
| | ||
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
Oops, something went wrong.
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.
do we have cases that get here?
Uh oh!
There was an error while loading. Please reload this page.
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.
Besides the two 2d array tests I just added ,
test_rank2()raises that Not Implemented Error when that line is there=============================================== short test summary info ================================================
FAILED pandas/tests/frame/methods/test_rank.py::TestRank::test_rank2 - NotImplementedError
FAILED pandas/tests/frame/methods/test_rank.py::TestRank::test_2d_extension_array_datetime - NotImplementedError
FAILED pandas/tests/frame/methods/test_rank.py::TestRank::test_2d_extension_array_timedelta - NotImplementedError
============================================ 3 failed, 131 passed in 5.58s =============================================
Uh oh!
There was an error while loading. Please reload this page.
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.
For the third "sub test" in
test_rank2: