-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
BUG: to_datetime with M or Y unit and non-round float #50301
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
Merged
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
7455e87
BUG: to_datetime with M or Y unit and non-round float
jbrockmendel 811aec9
use is_integer
jbrockmendel f66303d
Merge branch 'main' into depr-cast_from_unit
jbrockmendel 5ecec46
Merge branch 'main' into depr-cast_from_unit
jbrockmendel 530437c
Merge branch 'main' into depr-cast_from_unit
jbrockmendel 1bfc2a3
Merge branch 'main' into depr-cast_from_unit
jbrockmendel 3d6d2a0
GH ref
jbrockmendel d13fcbf
Merge branch 'main' into depr-cast_from_unit
jbrockmendel f008c84
added test
jbrockmendel 2a34cd2
Merge branch 'main' into depr-cast_from_unit
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -271,9 +271,13 @@ def array_with_unit_to_datetime( | |
ndarray[int64_t] iresult | ||
ndarray[object] oresult | ||
object tz = None | ||
bint is_ym | ||
float fval | ||
|
||
assert is_ignore or is_coerce or is_raise | ||
|
||
is_ym = unit in "YM" | ||
|
||
if unit == "ns": | ||
result, tz = array_to_datetime( | ||
values.astype(object, copy=False), | ||
|
@@ -298,6 +302,18 @@ def array_with_unit_to_datetime( | |
if val != val or val == NPY_NAT: | ||
iresult[i] = NPY_NAT | ||
else: | ||
if is_ym and is_float_object(val) and not val.is_integer(): | ||
# Analogous to GH#47266 for Timestamp | ||
if is_raise: | ||
raise ValueError( | ||
f"Conversion of non-round float with unit={unit} " | ||
"is ambiguous" | ||
) | ||
elif is_ignore: | ||
raise AssertionError | ||
iresult[i] = NPY_NAT | ||
continue | ||
|
||
try: | ||
iresult[i] = cast_from_unit(val, unit) | ||
except OverflowError: | ||
|
@@ -314,8 +330,33 @@ def array_with_unit_to_datetime( | |
iresult[i] = NPY_NAT | ||
|
||
else: | ||
|
||
try: | ||
fval = float(val) | ||
except ValueError: | ||
if is_raise: | ||
raise ValueError( | ||
f"non convertible value {val} with the unit '{unit}'" | ||
) | ||
elif is_ignore: | ||
raise AssertionError | ||
iresult[i] = NPY_NAT | ||
continue | ||
|
||
if is_ym and not fval.is_integer(): | ||
# Analogous to GH#47266 for Timestamp | ||
if is_raise: | ||
raise ValueError( | ||
f"Conversion of non-round float with unit={unit} " | ||
"is ambiguous" | ||
) | ||
elif is_ignore: | ||
raise AssertionError | ||
iresult[i] = NPY_NAT | ||
continue | ||
Comment on lines
+338
to
+348
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. sorry to block this, but is there a test that hits this? I can see tests when |
||
|
||
try: | ||
iresult[i] = cast_from_unit(float(val), unit) | ||
iresult[i] = cast_from_unit(fval, unit) | ||
except ValueError: | ||
if is_raise: | ||
raise ValueError( | ||
|
@@ -353,6 +394,7 @@ def array_with_unit_to_datetime( | |
# and are in ignore mode | ||
# redo as object | ||
|
||
# TODO: fix subtle differences between this and no-unit code | ||
oresult = cnp.PyArray_EMPTY(values.ndim, values.shape, cnp.NPY_OBJECT, 0) | ||
for i in range(n): | ||
val = values[i] | ||
|
@@ -365,7 +407,7 @@ def array_with_unit_to_datetime( | |
oresult[i] = <object>NaT | ||
else: | ||
try: | ||
oresult[i] = Timestamp(cast_from_unit(val, unit)) | ||
oresult[i] = Timestamp(val, unit=unit) | ||
except OverflowError: | ||
oresult[i] = val | ||
MarcoGorelli marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
|
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.
Uh oh!
There was an error while loading. Please reload this page.