Skip to content
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.

Sign up for GitHub

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

BUG: fix to_datetime with np.datetime64[ps] giving wrong conversion #60342

Merged
merged 4 commits into from
Nov 20, 2024
Merged

BUG: fix to_datetime with np.datetime64[ps] giving wrong conversion #60342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d888ac7
Add test
yuanx749 Nov 17, 2024
4fbd28b
Fix to_datetime with wrapped datetime64[ps]
yuanx749 Nov 17, 2024
e7a5d08
Merge remote-tracking branch 'upstream/main' into np_datetime-ps
yuanx749 Nov 19, 2024
0b07a5c
Add whatsnew
yuanx749 Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v3.0.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@ Datetimelike
- Bug in :meth:`Series.dt.microsecond` producing incorrect results for pyarrow backed :class:`Series`. (:issue:`59154`)
- Bug in :meth:`to_datetime` not respecting dayfirst if an uncommon date string was passed. (:issue:`58859`)
- Bug in :meth:`to_datetime` reports incorrect index in case of any failure scenario. (:issue:`58298`)
- Bug in :meth:`to_datetime` wrongly converts when ``arg`` is a ``np.datetime64`` object with unit of ``ps``. (:issue:`60341`)
- Bug in setting scalar values with mismatched resolution into arrays with non-nanosecond ``datetime64``, ``timedelta64`` or :class:`DatetimeTZDtype` incorrectly truncating those scalars (:issue:`56410`)

Timedelta
Expand Down
11 changes: 6 additions & 5 deletions pandas/_libs/src/vendored/numpy/datetime/np_datetime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,11 +660,12 @@ void pandas_datetime_to_datetimestruct(npy_datetime dt, NPY_DATETIMEUNIT base,
perday = 24LL * 60 * 60 * 1000 * 1000 * 1000 * 1000;

set_datetimestruct_days(extract_unit(&dt, perday), out);
out->hour = (npy_int32)extract_unit(&dt, 1000LL * 1000 * 1000 * 60 * 60);
out->min = (npy_int32)extract_unit(&dt, 1000LL * 1000 * 1000 * 60);
out->sec = (npy_int32)extract_unit(&dt, 1000LL * 1000 * 1000);
out->us = (npy_int32)extract_unit(&dt, 1000LL);
out->ps = (npy_int32)(dt * 1000);
out->hour =
(npy_int32)extract_unit(&dt, 1000LL * 1000 * 1000 * 1000 * 60 * 60);
out->min = (npy_int32)extract_unit(&dt, 1000LL * 1000 * 1000 * 1000 * 60);
out->sec = (npy_int32)extract_unit(&dt, 1000LL * 1000 * 1000 * 1000);
out->us = (npy_int32)extract_unit(&dt, 1000LL * 1000);
out->ps = (npy_int32)(dt);
break;

case NPY_FR_fs:
Expand Down
9 changes: 9 additions & 0 deletions pandas/tests/tools/test_to_datetime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3668,3 +3668,12 @@ def test_to_datetime_mixed_awareness_mixed_types(aware_val, naive_val, naive_fir
to_datetime(vec, format="mixed")
with pytest.raises(ValueError, match=msg):
DatetimeIndex(vec)


def test_to_datetime_wrapped_datetime64_ps():
# GH#60341
result = to_datetime([np.datetime64(1901901901901, "ps")])
expected = DatetimeIndex(
["1970-01-01 00:00:01.901901901"], dtype="datetime64[ns]", freq=None
)
tm.assert_index_equal(result, expected)
Loading