Skip to content

BUG: fix to_timedelta ignoring unit for mixed round/non-round floats #65170

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

Open
jbrockmendel wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −8
Open

BUG: fix to_timedelta ignoring unit for mixed round/non-round floats #65170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions pandas/_libs/tslibs/timedeltas.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,13 +488,15 @@ def array_to_timedelta64(
if item == NPY_NAT:
ival = NPY_NAT
else:
ival = _numeric_to_td64ns(item, parsed_unit, int_reso)
# GH#65150 match the pattern in tslib.pyx: update creso
# first, then convert using creso as the output resolution.
item_reso = int_reso

state.update_creso(item_reso)
if infer_reso:
creso = state.creso

ival = _numeric_to_td64ns(item, parsed_unit, creso)

elif is_float_object(item):
int_item = int(item)
if item == int_item:
Expand All @@ -505,21 +507,20 @@ def array_to_timedelta64(
if item == NPY_NAT:
ival = NPY_NAT
else:
ival = _numeric_to_td64ns(item, parsed_unit, int_reso)
item_reso = int_reso

state.update_creso(item_reso)
if infer_reso:
creso = state.creso
else:
ival = _numeric_to_td64ns(item, parsed_unit, NPY_FR_ns)

ival = _numeric_to_td64ns(item, parsed_unit, creso)
else:
item_reso = NPY_FR_ns
int_reso = NPY_FR_ns
state.update_creso(item_reso)
if infer_reso:
creso = state.creso

ival = _numeric_to_td64ns(item, parsed_unit, creso)

elif isinstance(item, Day):
# GH#64240: support Day offsets in list-like conversion
ival = item.n * 86400
Expand Down
13 changes: 12 additions & 1 deletion pandas/tests/tools/test_to_timedelta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,17 @@ def test_to_timedelta_unit_non_round_floats(self):
result2 = to_timedelta(arr2, unit="s")
assert result2.unit == "ns"

def test_to_timedelta_unit_mixed_round_and_non_round_floats(self):
# GH#65150 - round floats mixed with non-round floats should
# respect the unit for all values
result = to_timedelta([1.0, 1.01], unit="s")
expected = to_timedelta(np.array([1.0, 1.01]), unit="s")
tm.assert_index_equal(result, expected)

# Also test integers mixed with non-round floats
result2 = to_timedelta([1, 1.01], unit="s")
tm.assert_index_equal(result2, expected)

def test_float_to_timedelta_raise_near_bounds(self):
# GH#57366
oneday_in_ns = 1e9 * 60 * 60 * 24
Expand Down Expand Up @@ -438,7 +449,7 @@ def test_uint64_to_timedelta_coerce(self):
arr = np.array([uint64_max], dtype=np.uint64)

result = to_timedelta(arr, unit="ns", errors="coerce")
expected = TimedeltaIndex([pd.NaT])
expected = TimedeltaIndex([pd.NaT], dtype="m8[ns]")
tm.assert_index_equal(result, expected)

# scalar
Expand Down
Loading