Skip to content

API/BUG: Enforce "normalized" pytz timezones for DatetimeIndex #20510

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 24 commits into from
Apr 11, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b878540
DOC: update the Index.isin docstring (#20249)
noemielteto Mar 18, 2018
0b0fb83
MAINT: Remove weird pd file
gfyoung Mar 19, 2018
8316501
BUG: Retain timezone when resampling
mroeschke Mar 21, 2018
0bb1b13
Normalize pytz timezone for Datetimeindexes
mroeschke Mar 22, 2018
4d6f0d1
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Mar 23, 2018
4a202b0
Change construction of tz
mroeschke Mar 26, 2018
29560c4
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Mar 27, 2018
87cacf8
lint and add whatsnew
mroeschke Mar 27, 2018
e8990fc
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Mar 28, 2018
b1f2724
Adjust whatsnew and add additional test
mroeschke Mar 28, 2018
c1241f9
Adjust test
mroeschke Mar 28, 2018
9833f01
Address review and failing CI test
mroeschke Mar 29, 2018
43fab89
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Mar 29, 2018
f1a5ca7
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Mar 30, 2018
bba5da5
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Mar 31, 2018
8b397d4
Remove extra copy
mroeschke Mar 31, 2018
464a91b
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Mar 31, 2018
c1db598
add same tz error to timestamp
mroeschke Mar 31, 2018
bf1ec9e
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Apr 2, 2018
81ccb21
Add description of issue
mroeschke Apr 2, 2018
12f697b
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Apr 3, 2018
867ef19
Merge remote-tracking branch 'upstream/master' into resample_timezone
mroeschke Apr 4, 2018
360c295
Use cache_readonly
mroeschke Apr 4, 2018
67a29d5
standardize ._tz directly
mroeschke Apr 6, 2018
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
Add description of issue
  • Loading branch information
mroeschke committed Apr 2, 2018
commit 81ccb2102e0502cc7894398e24998f9a199508f0
2 changes: 1 addition & 1 deletion pandas/_libs/tslibs/timestamps.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ class Timestamp(_Timestamp):

@tz.setter
def tz(self, value):
# GH 3746
# GH 3746: Prevent localizing or converting the index by setting tz
raise AttributeError("Cannot directly set timezone. Use tz_localize() "
"or tz_convert() as appropriate")

Expand Down
2 changes: 1 addition & 1 deletion pandas/core/indexes/datetimes.py
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ def tz(self):

@tz.setter
def tz(self, value):
# GH 3746
# GH 3746: Prevent localizing or converting the index by setting tz
raise AttributeError("Cannot directly set timezone. Use tz_localize() "
"or tz_convert() as appropriate")

Expand Down