-
-
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
Changes from 6 commits
c89377c
ddcf978
42aeee0
9448242
da6fe09
15a1fa6
dd2c3eb
c575157
0d5774e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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 |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -295,3 +295,22 @@ def test_datetimetzdtype(tz, unit): | |||||
) | ||||||
df = pd.DataFrame({"ts_tz": tz_data}) | ||||||
tm.assert_frame_equal(df, from_dataframe(df.__dataframe__())) | ||||||
|
||||||
|
||||||
def test_interchange_from_non_pandas_tz_aware(): | ||||||
# GH 54239, 54287 | ||||||
pa = pytest.importorskip("pyarrow") | ||||||
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. we may need to set a minimum version here
Suggested change
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 added the minimum version here |
||||||
import pyarrow.compute as pc | ||||||
|
||||||
arr = pa.array([datetime(2020, 1, 1), None, datetime(2020, 1, 2)]) | ||||||
arr = pc.assume_timezone(arr, "Asia/Kathmandu") | ||||||
table = pa.table({"arr": arr}) | ||||||
exchange_df = table.__dataframe__() | ||||||
result = from_dataframe(exchange_df) | ||||||
|
||||||
expected = pd.DataFrame( | ||||||
["2020-01-01 00:00:00+05:45", "NaT", "2020-01-02 00:00:00+05:45"], | ||||||
columns=["arr"], | ||||||
dtype="datetime64[us, Asia/Kathmandu]", | ||||||
) | ||||||
tm.assert_frame_equal(expected, result) |
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.