Skip to content

implement assert_tzawareness_compat for DatetimeIndex #18376

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 37 commits into from
Jan 6, 2018
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
97c32fd
implement tzawareness_compat for datetimeIndex
jbrockmendel Nov 19, 2017
2f19f51
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Nov 19, 2017
f6a0e64
convert before asserting tzawareness_compat
jbrockmendel Nov 20, 2017
b18a006
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Nov 23, 2017
623681f
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Nov 24, 2017
28f8896
Update test to disallow tzaware vs tznaive comparison
jbrockmendel Nov 24, 2017
0f2287c
flake8 fixup
jbrockmendel Nov 24, 2017
171238d
Fix typo
jbrockmendel Nov 25, 2017
e95d75e
Move part of test per reviewer request
jbrockmendel Nov 25, 2017
ba65aaf
update test to include scalar comparisons
jbrockmendel Nov 25, 2017
49821d8
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Nov 25, 2017
2be828e
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Nov 25, 2017
b9e7c6d
revert hack, xfail test
jbrockmendel Nov 25, 2017
eefadf7
parametrize tests, comment for xfail
jbrockmendel Nov 26, 2017
470bd60
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Nov 26, 2017
abe65f8
remove debugging prints
jbrockmendel Dec 6, 2017
7cba103
rearrange isinstance checks per suggestion
jbrockmendel Dec 6, 2017
92dfed4
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Dec 6, 2017
2d68f01
add whatsnew note
jbrockmendel Dec 6, 2017
712096b
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Dec 7, 2017
f0c76ac
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Dec 7, 2017
ddf1cea
fix duplicate line from merge mixup
jbrockmendel Dec 7, 2017
3b4a01e
put comment into xfail message
jbrockmendel Dec 7, 2017
aeef3d7
Fixup missing keyword
jbrockmendel Dec 7, 2017
cc5976a
Merge branch 'master' into PR_TOOL_MERGE_PR_18376
jreback Dec 12, 2017
662c447
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Dec 12, 2017
123a52d
Merge branch 'tzbugs' of https://github.com/jbrockmendel/pandas into …
jbrockmendel Dec 12, 2017
909d07a
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Dec 14, 2017
f21f025
give strings a free pass from tzawareness compat
jbrockmendel Dec 16, 2017
ead6e3a
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Dec 21, 2017
a6008e0
add list test cases
jbrockmendel Jan 4, 2018
0233a48
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Jan 4, 2018
e2611dc
follow precedent to separate out xfailed tests
jbrockmendel Jan 4, 2018
82ead56
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Jan 5, 2018
5653c61
move whatsnew to conversion
jbrockmendel Jan 5, 2018
615aad5
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Jan 5, 2018
31b7336
Merge branch 'master' of https://github.com/pandas-dev/pandas into tz…
jbrockmendel Jan 5, 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
Fix typo
  • Loading branch information
jbrockmendel committed Nov 25, 2017
commit 171238d9140b14c6089703ad8e11fb18f854b8aa
2 changes: 1 addition & 1 deletion pandas/tests/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def __init__(self, obj):
def setup_method(self, method):
pass

def test_invalida_delgation(self):
def test_invalid_delegation(self):
# these show that in order for the delegation to work
# the _delegate_* methods need to be overriden to not raise a TypeError

Expand Down