Skip to content

TST: fix tests catching unorderable errors for python 3.6 #15007

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 1 commit into from
Dec 30, 2016
Merged

TST: fix tests catching unorderable errors for python 3.6 #15007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions pandas/tests/indexes/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,8 +1807,7 @@ def test_order(self):
idx = self.create_index()
# 9816 deprecated
if PY36:
with tm.assertRaisesRegexp(TypeError, "'>' not supported "
"between instances of 'str' and 'int'"):
with tm.assertRaisesRegexp(TypeError, "'>' not supported"):
with tm.assert_produces_warning(FutureWarning):
idx.order()
elif PY3:
Expand All @@ -1822,8 +1821,7 @@ def test_order(self):
def test_argsort(self):
idx = self.create_index()
if PY36:
with tm.assertRaisesRegexp(TypeError, "'>' not supported "
"between instances of 'str' and 'int'"):
with tm.assertRaisesRegexp(TypeError, "'>' not supported"):
result = idx.argsort()
elif PY3:
with tm.assertRaisesRegexp(TypeError, "unorderable types"):
Expand All @@ -1836,8 +1834,7 @@ def test_argsort(self):
def test_numpy_argsort(self):
idx = self.create_index()
if PY36:
with tm.assertRaisesRegexp(TypeError, "'>' not supported "
"between instances of 'str' and 'int'"):
with tm.assertRaisesRegexp(TypeError, "'>' not supported"):
result = np.argsort(idx)
elif PY3:
with tm.assertRaisesRegexp(TypeError, "unorderable types"):
Expand Down