8000 Merge pull request #21288 from QuLogic/fix-mac-ci · matplotlib/matplotlib@49aebe2 · GitHub
[go: up one dir, main page]

Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 49aebe2

Browse files
authored
Merge pull request #21288 from QuLogic/fix-mac-ci
Allow macosx thread safety test on macOS11
2 parents 8d0d1e6 + 31f4de0 commit 49aebe2

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

lib/matplotlib/tests/test_backends_interactive.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,14 @@ def _test_thread_impl():
222222
param.marks.append(
223223
pytest.mark.xfail(raises=subprocess.CalledProcessError))
224224
elif backend == "macosx":
225-
param.marks.append(
226-
pytest.mark.xfail(raises=subprocess.TimeoutExpired, strict=True))
225+
from packaging.version import parse
226+
mac_ver = platform.mac_ver()[0]
227+
# Note, macOS Big Sur is both 11 and 10.16, depending on SDK that
228+
# Python was compiled against.
229+
if mac_ver and parse(mac_ver) < parse('10.16'):
230+
param.marks.append(
231+
pytest.mark.xfail(raises=subprocess.TimeoutExpired,
232+
strict=True))
227233
elif param.values[0].get("QT_API") == "PySide2":
228234
param.marks.append(
229235
pytest.mark.xfail(raises=subprocess.CalledProcessError))

0 commit comments

Comments
 (0)
0