From 6e0520539fa0b7b3dc9e038f105c42325f6b9191 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 29 May 2023 23:57:59 -0400 Subject: [PATCH 1/2] TST: Skip PySide6 6.5.1 for testing This version is buggy with respect to signals, and causes tests to fail: - https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346 - https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2348 --- .github/workflows/tests.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d9a6c88cdb80..9f137b720937 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -62,13 +62,21 @@ jobs: python-version: 3.9 extra-requirements: '-r requirements/testing/extra.txt' CFLAGS: "-fno-lto" # Ensure that disabling LTO works. + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346 + pyside6-ver: '!=6.5.1' - os: ubuntu-20.04 python-version: '3.10' extra-requirements: '-r requirements/testing/extra.txt' + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346 + pyside6-ver: '!=6.5.1' - os: ubuntu-20.04 python-version: '3.11' + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346 + pyside6-ver: '!=6.5.1' - os: macos-latest python-version: 3.9 + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346 + pyside6-ver: '!=6.5.1' steps: - uses: actions/checkout@v3 From db3477c60059c09c0ea3705858b482335d622a32 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 30 May 2023 00:23:33 -0400 Subject: [PATCH 2/2] CI: Mark Tk tests on macOS Azure as xfail This is a re-application of #23095, but with some more specific conditions. Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Co-authored-by: Oscar Gustafsson --- lib/matplotlib/tests/test_backend_tk.py | 5 +++++ lib/matplotlib/tests/test_backends_interactive.py | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/lib/matplotlib/tests/test_backend_tk.py b/lib/matplotlib/tests/test_backend_tk.py index f3257acd5bd3..0e753b7041cd 100644 --- a/lib/matplotlib/tests/test_backend_tk.py +++ b/lib/matplotlib/tests/test_backend_tk.py @@ -38,6 +38,11 @@ def _isolated_tk_test(success_count, func=None): sys.platform == "linux" and not _c_internal_utils.display_is_valid(), reason="$DISPLAY and $WAYLAND_DISPLAY are unset" ) + @pytest.mark.xfail( # https://github.com/actions/setup-python/issues/649 + 'TF_BUILD' in os.environ and sys.platform == 'darwin' and + sys.version_info[:2] == (3, 10), + reason='Tk version mismatch on Azure macOS CI' + ) @functools.wraps(func) def test_func(): # even if the package exists, may not actually be importable this can diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py index a8cbc8885daf..325215a807ad 100644 --- a/lib/matplotlib/tests/test_backends_interactive.py +++ b/lib/matplotlib/tests/test_backends_interactive.py @@ -63,6 +63,10 @@ def _get_testable_interactive_backends(): elif env["MPLBACKEND"].startswith('wx') and sys.platform == 'darwin': # ignore on OSX because that's currently broken (github #16849) marks.append(pytest.mark.xfail(reason='github #16849')) + elif (env['MPLBACKEND'] == 'tkagg' and 'TF_BUILD' in os.environ and + sys.platform == 'darwin' and sys.version_info[:2] == (3, 10)): + marks.append( # https://github.com/actions/setup-python/issues/649 + pytest.mark.xfail(reason='Tk version mismatch on Azure macOS CI')) envs.append( pytest.param( {**env, 'BACKEND_DEPS': ','.join(deps)}, @@ -271,6 +275,10 @@ def _test_thread_impl(): reason='PyPy does not support Tkinter threading: ' 'https://foss.heptapod.net/pypy/pypy/-/issues/1929', strict=True)) + elif (backend == 'tkagg' and 'TF_BUILD' in os.environ and + sys.platform == 'darwin' and sys.version_info[:2] == (3, 10)): + param.marks.append( # https://github.com/actions/setup-python/issues/649 + pytest.mark.xfail('Tk version mismatch on Azure macOS CI')) @pytest.mark.parametrize("env", _thread_safe_backends) @@ -540,6 +548,11 @@ def _test_number_of_draws_script(): elif backend == "wx": param.marks.append( pytest.mark.skip("wx does not support blitting")) + elif (backend == 'tkagg' and 'TF_BUILD' in os.environ and + sys.platform == 'darwin' and sys.version_info[:2] == (3, 10)): + param.marks.append( # https://github.com/actions/setup-python/issues/649 + pytest.mark.xfail('Tk version mismatch on Azure macOS CI') + ) @pytest.mark.parametrize("env", _blit_backends) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy