-
- Notifications
You must be signed in to change notification settings - Fork 19.4k
BUG: Add fillna at the beginning of _where not to fill NA. #60729 #60772
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
sanggon6107 wants to merge 54 commits into pandas-dev:main Choose a base branch from sanggon6107:add-mask-fillna
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.
Open
Changes from 1 commit
Commits
Show all changes
54 commits Select commit Hold shift + click to select a range
bc9a942 BUG: Add fillna so that cond doesnt contain NA at the beginning of _w…
sanggon6107 558569f TST: Add tests for mask with NA. (#60729)
sanggon6107 bbbc720 BUG: Fix _where to make np.ndarray mutable. (#60729)
sanggon6107 e2f32cb DOC: Add documentation regarding the bug (#60729)
sanggon6107 6fd8986 Merge branch 'main' into add-mask-fillna
sanggon6107 d2d5f62 ENH: Optimze test_mask_na()
sanggon6107 475f2d1 BUG: Fix a bug in test_mask_na() (#60729)
sanggon6107 db30b58 Update doc/source/whatsnew/v3.0.0.rst
sanggon6107 55fe420 Merge branch 'main' into add-mask-fillna
sanggon6107 cb94cf7 Add test arguments for test_mask_na
sanggon6107 71e442e Fix whatsnew
sanggon6107 b6bd3af Fix test failures by adding importorskip
sanggon6107 8bac997 Fill True when tuple or list cond has np.nan/pd.NA
sanggon6107 89bc1b4 Merge branch 'main' into add-mask-fillna
sanggon6107 f154cf5 Optimize _where
sanggon6107 eed6121 Optimize test_mask_na
sanggon6107 9ac81f0 Add np.array for read-only ndarray
sanggon6107 7e3fd3a Merge branch 'main' into add-mask-fillna
sanggon6107 8c5ffff Update generic.py
sanggon6107 5516517 Revert generic.py
sanggon6107 2437ce2 Merge branch 'main' into add-mask-fillna
sanggon6107 9556aa4 Replace np.array with fillna
sanggon6107 b64b8a7 Correct the unintended deletion
sanggon6107 9574746 Merge branch 'main' into add-mask-fillna
sanggon6107 c073c0b Add test for list and ndarray
sanggon6107 4eea08e Handle list with NA
sanggon6107 bbc5612 Fix code checks
sanggon6107 0851593 Fix type
sanggon6107 98fb602 Optimize operation
sanggon6107 915b8a7 Prevent a list with np.nan converting to float
sanggon6107 7611f59 Add test for a list with np.nan
sanggon6107 88b0530 Merge branch 'main' into add-mask-fillna
sanggon6107 044d0a9 fillna after constructor
sanggon6107 601f6c9 Parametrize cond type
sanggon6107 4528a54 Merge branch 'main' into add-mask-fillna
sanggon6107 acf805a Merge branch 'main' into add-mask-fillna
sanggon6107 3239d2f Merge branch 'main' into add-mask-fillna
sanggon6107 f7a1e5a Merge branch 'main' into add-mask-fillna
sanggon6107 f3ed54d Merge main
sanggon6107 16dda53 Replace isinstance with is_bool
sanggon6107 dfa96ac Merge branch 'main' into add-mask-fillna
sanggon6107 e557c05 Remove dtype
sanggon6107 7e0d4e0 handle list with nan
sanggon6107 85f35e9 Merge branch 'main' into add-mask-fillna
sanggon6107 e2df2d0 Use astype instead of replace
sanggon6107 0526b02 Merge branch 'main' into add-mask-fillna
sanggon6107 ffd15b7 Merge branch 'main' into add-mask-fillna
sanggon6107 17b83cb Merge branch 'main' into add-mask-fillna
sanggon6107 350b75d Merge branch 'main' into add-mask-fillna
sanggon6107 e7f8fa7 Resolve git conflict
sanggon6107 506f39d Merge branch 'add-mask-fillna' of https://github.com/sanggon6107/pand…
sanggon6107 8b0c385 Raise when cond has nan/NA
sanggon6107 23934ec Fix test_mask_na
sanggon6107 9cd462e Fix test_where_na
sanggon6107 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
ENH: Optimze test_mask_na()
Co-authored-by: WillAyd <will_ayd@innobi.io>
- Loading branch information
commit d2d5f62c120739a4b1c55fdb7bb3351d45d42337
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,10 @@ | ||
| import numpy as np | ||
| import pytest | ||
| | ||
| from pandas import Series | ||
| from pandas import ( | ||
| Int64Dtype, | ||
| Series, | ||
| ) | ||
| import pandas._testing as tm | ||
| | ||
| | ||
| | @@ -71,15 +74,8 @@ def test_mask_inplace(): | |
| | ||
| def test_mask_na(): | ||
| # We should not be filling pd.NA. See GH#60729 | ||
| series = Series([None, 1, 2, None, 3, 4, None]) | ||
| series = series.convert_dtypes() | ||
| cond = series <= 2 | ||
| series = Series([None, 1, 2, None, 3, 4, None], dtype=Int64Dtype()) | ||
| result = series.mask(series <= 2, -99) | ||
| ||
| expected = Series([None, 1, 2, None, -99, -99, None], dtype=Int64Dtype()) | ||
| | ||
| maskres = series.mask(cond, -99) | ||
| whereres = series.where(~(cond), -99) | ||
| | ||
| expected = Series([None, -99, -99, None, 3, 4, None]) | ||
| expected = expected.convert_dtypes() | ||
| | ||
| tm.assert_series_equal(maskres, expected) | ||
| tm.assert_series_equal(maskres, whereres) | ||
| tm.assert_series_equal(result, expected) | ||
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.
Can you also add a test for arrow. Can parametrize with e.g.
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.
Thanks, just added a test for pyarrow.