Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

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

Sign up
Appearance settings

Commit491e2a7

Browse files
authored
Merge pull request#19301 from QuLogic/fix-azure
Fix several CI issues
2 parents75d1fbc +ed3760f commit491e2a7

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ environment:
1818
PYTHONIOENCODING:UTF-8
1919
PYTEST_ARGS:-raR --numprocesses=auto --timeout=300 --durations=25
2020
--cov-report= --cov=lib --log-level=DEBUG
21+
PINNEDVERS:"pyzmq!=21.0.0"
2122

2223
matrix:
2324
# In theory we could use a single CONDA_INSTALL_LOCN because we construct

‎azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ steps:
7272
texlive-xetex texlive-luatex
7373
;;
7474
darwin)
75-
brewcaskinstall xquartz
75+
brew install --cask xquartz
7676
brew install pkg-config ffmpeg imagemagick mplayer ccache
7777
;;
7878
win32)

‎lib/matplotlib/tests/test_backends_interactive.py

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,14 @@ def _get_testable_interactive_backends():
5050
reason="macosx backend fails on Azure"
5151
elif'qt5'inbackendandnothave_qt5:
5252
reason="no usable Qt5 bindings"
53+
marks= []
5354
ifreason:
54-
backend=pytest.param(
55-
backend,
56-
marks=pytest.mark.skip(
57-
reason=f"Skipping{backend} because{reason}"))
55+
marks.append(pytest.mark.skip(
56+
reason=f"Skipping{backend} because{reason}"))
5857
elifbackend.startswith('wx')andsys.platform=='darwin':
5958
# ignore on OSX because that's currently broken (github #16849)
60-
backend=pytest.param(
61-
backend,
62-
marks=pytest.mark.xfail(reason='github #16849'))
59+
marks.append(pytest.mark.xfail(reason='github #16849'))
60+
backend=pytest.param(backend,marks=marks)
6361
backends.append(backend)
6462
returnbackends
6563

@@ -216,16 +214,19 @@ def _test_thread_impl():
216214

217215
_thread_safe_backends=_get_testable_interactive_backends()
218216
# Known unsafe backends. Remove the xfails if they start to pass!
219-
if"wx"in_thread_safe_backends:
220-
_thread_safe_backends.remove("wx")
221-
_thread_safe_backends.append(
222-
pytest.param("wx",marks=pytest.mark.xfail(
223-
raises=subprocess.CalledProcessError)))
224-
if"macosx"in_thread_safe_backends:
225-
_thread_safe_backends.remove("macosx")
226-
_thread_safe_backends.append(
227-
pytest.param("macosx",marks=pytest.mark.xfail(
228-
raises=subprocess.TimeoutExpired,strict=True)))
217+
forparamin_thread_safe_backends:
218+
backend=param.values[0]
219+
if"cairo"inbackend:
220+
# Cairo backends save a cairo_t on the graphics context, and sharing
221+
# these is not threadsafe.
222+
param.marks.append(
223+
pytest.mark.xfail(raises=subprocess.CalledProcessError))
224+
elifbackend=="wx":
225+
param.marks.append(
226+
pytest.mark.xfail(raises=subprocess.CalledProcessError))
227+
elifbackend=="macosx":
228+
param.marks.append(
229+
pytest.mark.xfail(raises=subprocess.TimeoutExpired,strict=True))
229230

230231

231232
@pytest.mark.parametrize("backend",_thread_safe_backends)

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp