-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
BUG: during interchanging from non-pandas tz-aware data #54287
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
mroeschke
merged 9 commits into
pandas-dev:main
from
natmokval:add-test-interchanging-from-non-pandas-tz-aware
Jul 31, 2023
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c89377c
TST: add a test for interchanging from non-pandas tz-aware
natmokval ddcf978
TST: correct the test for interchanging from non-pandas tz-aware
natmokval 42aeee0
check an error in the test
natmokval 9448242
correct test
natmokval da6fe09
add extra except in set_nulls
natmokval 15a1fa6
fix bug during interchanging from non-pandas tz-aware
natmokval dd2c3eb
correct test
natmokval c575157
correct wording
natmokval 0d5774e
resolve conflict
natmokval 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 |
---|---|---|
|
@@ -7,6 +7,7 @@ | |
import numpy as np | ||
|
||
from pandas.compat._optional import import_optional_dependency | ||
from pandas.errors import SettingWithCopyError | ||
|
||
import pandas as pd | ||
from pandas.core.interchange.dataframe_protocol import ( | ||
|
@@ -513,5 +514,10 @@ def set_nulls( | |
# cast the `data` to nullable float dtype. | ||
data = data.astype(float) | ||
data[null_pos] = None | ||
except SettingWithCopyError: | ||
# SettingWithCopyError happens if the `data` appears | ||
# to have 'NaT'. If this happens, copy the `data`. | ||
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. "appears to" sounds a bit mysterious :) how about
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. thank you, I changed the wording as you suggested. |
||
data = data.copy() | ||
data[null_pos] = None | ||
|
||
return data |
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
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 we write
?
technically
nan
is different, and specifically refers to invalid mathematical operations like 0/0There 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.
oops, my mistake. I corrected that.