Skip to content

Commit

Permalink
fix MacPython / pandas-wheels ci failures (#25537)
Browse files Browse the repository at this point in the history
  • Loading branch information
simonjayhawkins authored and jreback committed Mar 5, 2019
1 parent 076b5a8 commit d10bbce
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pandas/tests/test_sorting.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +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 = (r"'(<|>)' not supported between instances of"
r" 'datetime\.datetime' and 'int'|"
msg = (r"'(<|>)' not supported between instances of ('"
r"datetime\.datetime' and 'int'|'int' and 'datetime\.datetime"
r"')|"
r"unorderable types: int\(\) > datetime\.datetime\(\)")
if compat.PY2:
# RuntimeWarning: tp_compare didn't return -1 or -2 for exception
Expand Down

0 comments on commit d10bbce

Please sign in to comment.