Skip to content

Last of the timezones funcs #17669

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 14 commits into from
Sep 29, 2017
Merged

Last of the timezones funcs #17669

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1932996
move infer_tzinfo from tools.datetime to tslibs.timezones
jbrockmendel Sep 25, 2017
6ccbfb2
whitespace fixup
jbrockmendel Sep 25, 2017
adf9099
fixup add missing cimport
jbrockmendel Sep 25, 2017
fcd26c1
de-privatize infer_tzinfo, update imports
jbrockmendel Sep 25, 2017
355cbe8
rename _infer_dst --> infer_dst_transitions per reviewer request
jbrockmendel Sep 26, 2017
e17089c
Remove nested _infer func
jbrockmendel Sep 26, 2017
b82396d
flake8 fixup
jbrockmendel Sep 26, 2017
e6096c5
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Sep 26, 2017
926bb73
fixup remove unused import
jbrockmendel Sep 27, 2017
2afc7b2
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Sep 28, 2017
8f4b368
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Sep 28, 2017
7b4c9b2
rever infer_dst_transition
jbrockmendel Sep 28, 2017
0248f53
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Sep 28, 2017
ce701e5
dummy commit to force CI
jbrockmendel Sep 29, 2017
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
Prev Previous commit
Next Next commit
whitespace fixup
  • Loading branch information
@jbrockmendel
jbrockmendel committed Sep 25, 2017
commit 6ccbfb241390e2f80df1908660a886862fe7c7ef
4 changes: 2 additions & 2 deletions pandas/_libs/tslibs/timezones.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ cdef bint is_fixed_offset(object tz)
cdef object get_dst_info(object tz)

cdef ndarray[int64_t] _infer_dst(ndarray[int64_t] vals,
ndarray[int64_t] result_a,
ndarray[int64_t] result_b)
ndarray[int64_t] result_a,
ndarray[int64_t] result_b)