Skip to content

ENH: implement non-nano Timedelta scalar #46688

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

Merged
merged 17 commits into from
Apr 18, 2022
Merged

ENH: implement non-nano Timedelta scalar #46688

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
66e06db
ENH: implement non-nano Timedelta scalar
jbrockmendel Apr 7, 2022
e64bbc6
Merge branch 'main' into nano-td
jbrockmendel Apr 8, 2022
6b2a2c4
troubleshoot non-mac builds
jbrockmendel Apr 8, 2022
bdb1d36
troubleshoot non-mac builds
jbrockmendel Apr 8, 2022
371b9e3
troubleshoot non-mac builds
jbrockmendel Apr 8, 2022
58a208d
troubleshoot non-mac builds
jbrockmendel Apr 8, 2022
e15b591
troubleshoot non-mac builds
jbrockmendel Apr 8, 2022
5f95506
troubleshoot non-mac builds
jbrockmendel Apr 8, 2022
acea307
troubleshoot non-mac builds
jbrockmendel Apr 8, 2022
5cb584a
troubleshoot non-mac builds
jbrockmendel Apr 9, 2022
09456e5
troubleshoot non-mac builds
jbrockmendel Apr 9, 2022
039b7ab
revert troubleshooting
jbrockmendel Apr 9, 2022
3b26b7d
lint fixup
jbrockmendel Apr 9, 2022
4146a8a
Merge branch 'main' into nano-td
jbrockmendel Apr 10, 2022
4aee01a
comment, simplify
jbrockmendel Apr 10, 2022
cc07d4e
Merge branch 'main' into nano-td
jbrockmendel Apr 11, 2022
6d0d714
fix hash
jbrockmendel Apr 11, 2022
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
Prev Previous commit
Next Next commit
revert troubleshooting
  • Loading branch information
@jbrockmendel
jbrockmendel committed Apr 9, 2022
commit 039b7ab3113b898da2ade241cf3e97c5737bbb66
13 changes: 4 additions & 9 deletions pandas/_libs/tslibs/offsets.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,14 @@ from pandas._libs.tslibs.np_datetime cimport (
from pandas._libs.tslibs.tzconversion cimport tz_convert_from_utc_single

from .dtypes cimport PeriodDtypeCode

#from .timedeltas cimport (
# delta_to_nanoseconds,
# is_any_td_scalar,
#)

from .timedeltas import (
Timedelta,
from .timedeltas cimport (
delta_to_nanoseconds,
is_any_td_scalar,
)

from .base cimport ABCTimestamp as _Timestamp
from .timedeltas import Timedelta

from .timestamps cimport _Timestamp

from .timestamps import Timestamp

Expand Down
7 changes: 1 addition & 6 deletions pandas/_libs/tslibs/timedeltas.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ from pandas._libs.tslibs.np_datetime cimport (

from pandas._libs.tslibs.np_datetime import OutOfBoundsTimedelta

#from pandas._libs.tslibs.offsets cimport is_tick_object
from pandas._libs.tslibs.offsets cimport is_tick_object
from pandas._libs.tslibs.util cimport (
is_array,
is_datetime64_object,
Expand All @@ -73,11 +73,6 @@ from pandas._libs.tslibs.fields import (
)


cdef inline bint is_tick_object(object obj):
# KLUDGE to avoid circular cimport
return any(x.__name__ == "Tick" for x in obj.__mro__())


# ----------------------------------------------------------------------
# Constants

Expand Down