Skip to content

Commit

Permalink
fix MacPython / pandas-wheels ci failures (#25505)
Browse files Browse the repository at this point in the history
  • Loading branch information
simonjayhawkins authored and jreback committed Mar 1, 2019
1 parent 011f0a6 commit 1f8d7e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pandas/tests/test_algos.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def test_complex_sorting(self):
# gh 12666 - check no segfault
x17 = np.array([complex(i) for i in range(17)], dtype=object)

msg = ("'<' not supported between instances of 'complex' and"
msg = (r"'(<|>)' not supported between instances of 'complex' and"
r" 'complex'|"
r"unorderable types: complex\(\) > complex\(\)")
with pytest.raises(TypeError, match=msg):
Expand Down
6 changes: 3 additions & 3 deletions pandas/tests/test_sorting.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,9 @@ def test_mixed_integer_from_list(self):
def test_unsortable(self):
# GH 13714
arr = np.array([1, 2, datetime.now(), 0, 3], dtype=object)
msg = ("'<' not supported between instances of 'datetime.datetime'"
r" and 'int'|"
r"unorderable types: int\(\) > datetime.datetime\(\)")
msg = (r"'(<|>)' not supported between instances of"
r" 'datetime\.datetime' and 'int'|"
r"unorderable types: int\(\) > datetime\.datetime\(\)")
if compat.PY2:
# RuntimeWarning: tp_compare didn't return -1 or -2 for exception
with warnings.catch_warnings():
Expand Down

0 comments on commit 1f8d7e0

Please sign in to comment.