-
Notifications
You must be signed in to change notification settings - Fork 473
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
support timedelta in Q_.init #1978
Open
andrewgsavage
wants to merge
4
commits into
hgrecco:master
Choose a base branch
from
andrewgsavage:infer_time
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
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 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 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 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 |
---|---|---|
|
@@ -30,8 +30,11 @@ | |
deprecated, | ||
eq, | ||
is_duck_array_type, | ||
is_timedelta, | ||
is_timedelta_array, | ||
is_upcast_type, | ||
np, | ||
to_seconds, | ||
zero_or_nan, | ||
) | ||
from ...errors import DimensionalityError, OffsetUnitCalculusError, PintTypeError | ||
|
@@ -203,7 +206,7 @@ def __new__(cls, value, units=None): | |
return copy.copy(value) | ||
|
||
inst = SharedRegistryObject().__new__(cls) | ||
if units is None and isinstance(value, datetime.timedelta): | ||
if units is None and (is_timedelta(value) or is_timedelta_array(value)): | ||
units = inst.UnitsContainer({"s": 1}) | ||
elif units is None: | ||
units = inst.UnitsContainer() | ||
|
@@ -225,8 +228,8 @@ def __new__(cls, value, units=None): | |
"units must be of type str, PlainQuantity or " | ||
"UnitsContainer; not {}.".format(type(units)) | ||
) | ||
if isinstance(value, datetime.timedelta): | ||
inst._magnitude = value.total_seconds() | ||
if is_timedelta(value) or is_timedelta_array(value): | ||
inst._magnitude = to_seconds(value) | ||
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. would it be possible to special-case |
||
inst._units = inst.UnitsContainer({"s": 1}) | ||
return inst.to(units) | ||
|
||
|
This file contains 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
Oops, something went wrong.
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.
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.
this is not going to work in general:
timedelta64
has its own units, which can range from days (or years?) to nanoseconds, andastype(float)
is the equivalent ofmagnitude
. I don't have any advice on how to extract that, though, other than parsing the string repr of the dtype.