Skip to content

Commit 1f8d7e0

Browse files
simonjayhawkinsjreback
authored andcommitted
fix MacPython / pandas-wheels ci failures (#25505)
1 parent 011f0a6 commit 1f8d7e0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pandas/tests/test_algos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ def test_complex_sorting(self):
229229
# gh 12666 - check no segfault
230230
x17 = np.array([complex(i) for i in range(17)], dtype=object)
231231

232-
msg = ("'<' not supported between instances of 'complex' and"
232+
msg = (r"'(<|>)' not supported between instances of 'complex' and"
233233
r" 'complex'|"
234234
r"unorderable types: complex\(\) > complex\(\)")
235235
with pytest.raises(TypeError, match=msg):

pandas/tests/test_sorting.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,9 @@ def test_mixed_integer_from_list(self):
409409
def test_unsortable(self):
410410
# GH 13714
411411
arr = np.array([1, 2, datetime.now(), 0, 3], dtype=object)
412-
msg = ("'<' not supported between instances of 'datetime.datetime'"
413-
r" and 'int'|"
414-
r"unorderable types: int\(\) > datetime.datetime\(\)")
412+
msg = (r"'(<|>)' not supported between instances of"
413+
r" 'datetime\.datetime' and 'int'|"
414+
r"unorderable types: int\(\) > datetime\.datetime\(\)")
415415
if compat.PY2:
416416
# RuntimeWarning: tp_compare didn't return -1 or -2 for exception
417417
with warnings.catch_warnings():

0 commit comments

Comments
 (0)