-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
CLN: de-duplicate paths in tslibs #34400
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
7 commits
Select commit
Hold shift + click to select a range
383e840
CLN: de-duplicate, annotate
jbrockmendel 46702d8
Merge branch 'master' of https://github.com/pandas-dev/pandas into cl…
jbrockmendel 582f22d
Merge branch 'master' of https://github.com/pandas-dev/pandas into cl…
jbrockmendel 7284ed0
Merge branch 'master' of https://github.com/pandas-dev/pandas into cl…
jbrockmendel 0069560
lint fixup
jbrockmendel 4804b36
Merge branch 'master' of https://github.com/pandas-dev/pandas into cl…
jbrockmendel 6e3530d
remove unnecessary shim call
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
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 |
---|---|---|
|
@@ -28,27 +28,19 @@ cdef: | |
|
||
# ---------------------------------------------------------------------- | ||
|
||
cpdef resolution(const int64_t[:] stamps, tz=None): | ||
def resolution(const int64_t[:] stamps, tz=None): | ||
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. not called in cython anylonger? 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. not sure if it ever was |
||
cdef: | ||
Py_ssize_t i, n = len(stamps) | ||
npy_datetimestruct dts | ||
int reso = RESO_DAY, curr_reso | ||
|
||
if tz is not None: | ||
tz = maybe_get_tz(tz) | ||
return _reso_local(stamps, tz) | ||
|
||
|
||
cdef _reso_local(const int64_t[:] stamps, object tz): | ||
cdef: | ||
Py_ssize_t i, n = len(stamps) | ||
int reso = RESO_DAY, curr_reso | ||
ndarray[int64_t] trans | ||
int64_t[:] deltas | ||
Py_ssize_t[:] pos | ||
npy_datetimestruct dts | ||
int64_t local_val, delta | ||
|
||
if tz is not None: | ||
tz = maybe_get_tz(tz) | ||
|
||
if is_utc(tz) or tz is None: | ||
for i in range(n): | ||
if stamps[i] == NPY_NAT: | ||
|
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 |
---|---|---|
@@ -1,5 +1,4 @@ | ||
from datetime import datetime, timedelta | ||
import operator | ||
|
||
import numpy as np | ||
|
||
|
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.
do we even need this routine any longer? (e.g. just call localize_dt64arr_to_period in the caller)
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.
sure