-
-
Notifications
You must be signed in to change notification settings - Fork 18.8k
DEPR: Categorical with values not present in categories #62142
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
jbrockmendel
wants to merge
11
commits into
pandas-dev:main
Choose a base branch
from
jbrockmendel:api-40996
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.
+233
−104
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
9a76ad6
DEPR: Categorical with values not present in categories
jbrockmendel a89dee5
update docs
jbrockmendel b82fdb1
update docs
jbrockmendel fcd2773
update docstrings
jbrockmendel 85d4980
update doc
jbrockmendel c46dee9
update doc
jbrockmendel ea40e3d
Merge branch 'main' into api-40996
jbrockmendel e732fb9
un-comment-out, remove duplicate check
jbrockmendel faddfde
Merge branch 'main' into api-40996
jbrockmendel de9bec0
Merge branch 'main' into api-40996
jbrockmendel ddab79c
catch warning in _cast_pointwise_result
jbrockmendel 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
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
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 |
---|---|---|
|
@@ -22,7 +22,6 @@ | |
from pandas.core.dtypes.dtypes import CategoricalDtype | ||
from pandas.core.dtypes.missing import ( | ||
is_valid_na_for_dtype, | ||
isna, | ||
) | ||
|
||
from pandas.core.arrays.categorical import ( | ||
|
@@ -258,6 +257,12 @@ def _is_dtype_compat(self, other: Index) -> Categorical: | |
else: | ||
values = other | ||
|
||
codes = self.categories.get_indexer(values) | ||
if ((codes == -1) & ~values.isna()).any(): | ||
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. Do we still need the check on L269 with this? 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. i think not, will check and update |
||
# GH#37667 see test_equals_non_category | ||
raise TypeError( | ||
"categories must match existing categories when appending" | ||
) | ||
cat = Categorical(other, dtype=self.dtype) | ||
other = CategoricalIndex(cat) | ||
if not other.isin(values).all(): | ||
|
@@ -266,12 +271,6 @@ def _is_dtype_compat(self, other: Index) -> Categorical: | |
) | ||
cat = other._values | ||
|
||
if not ((cat == values) | (isna(cat) & isna(values))).all(): | ||
# GH#37667 see test_equals_non_category | ||
raise TypeError( | ||
"categories must match existing categories when appending" | ||
) | ||
|
||
return cat | ||
|
||
def equals(self, other: object) -> bool: | ||
|
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
Oops, something went wrong.
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.
When the deprecation is enforced, do we still need to pass the flag on whether to allow values outside the categories?
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.
the flag will become a "should we raise" flag, and will still be needed bc the answer will be "no" for
set_categories