From f8d92c38c7e12de984bbf7b0d08ff475b4378e18 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 09:27:10 -0400 Subject: [PATCH 01/15] CI: Fix conda [skip azp] [skip circle] --- .github/workflows/linux_conda.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index 3201bcd8d65..9a00322566a 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -11,9 +11,9 @@ on: - '*' jobs: - py39: + py310: runs-on: ubuntu-20.04 - name: 'linux conda 3.9' + name: 'linux conda 3.10' defaults: run: shell: bash @@ -23,7 +23,8 @@ jobs: MNE_LOGGING_LEVEL: 'warning' MKL_NUM_THREADS: '1' PYTHONUNBUFFERED: '1' - PYTHON_VERSION: '3.9' + PYTHON_VERSION: '3.10' + MESA_GL_VERSION_OVERRIDE: '4.5FC' steps: - uses: actions/checkout@v2 - run: ./tools/setup_xvfb.sh From ea85044945a998e98b0f46e893ec32cd2778e2c2 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 09:53:17 -0400 Subject: [PATCH 02/15] FIX: Bad version? --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 9afc1d762b3..5caa58223f4 100644 --- a/environment.yml +++ b/environment.yml @@ -38,7 +38,7 @@ dependencies: - nilearn - python-picard - qtpy -- pyqt!=5.15.3 +- pyqt!=5.15.3,!=5.15.4 - mne - mffpy>=0.5.7 - ipywidgets From f08bac01562e3c795cdeb483ebd0097631e5752f Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 10:06:35 -0400 Subject: [PATCH 03/15] MAINT: Revert --- .github/workflows/linux_conda.yml | 3 +++ environment.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index 9a00322566a..179d5b1891e 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -46,6 +46,9 @@ jobs: - shell: bash -el {0} run: ./tools/github_actions_install.sh name: 'Install MNE' + - shell: bash -el {} + run: LIBGL_DEBUG=verbose python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" + name: 'Check Qt GL' - shell: bash -el {0} run: ./tools/github_actions_infos.sh name: 'Show infos' diff --git a/environment.yml b/environment.yml index 5caa58223f4..1c60e770850 100644 --- a/environment.yml +++ b/environment.yml @@ -38,7 +38,7 @@ dependencies: - nilearn - python-picard - qtpy -- pyqt!=5.15.3,!=5.15.4 +- pyqt - mne - mffpy>=0.5.7 - ipywidgets From 6b8cebed290fbfa262371d02b68f0febfcac33d8 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 11:16:08 -0400 Subject: [PATCH 04/15] WIP: Try again [skip azp] [skip circle] --- .github/workflows/linux_conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index 179d5b1891e..d4a9d427c5a 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -46,7 +46,7 @@ jobs: - shell: bash -el {0} run: ./tools/github_actions_install.sh name: 'Install MNE' - - shell: bash -el {} + - shell: bash -el {0} run: LIBGL_DEBUG=verbose python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" name: 'Check Qt GL' - shell: bash -el {0} From ce8d3416fd8ec1632c354ad7297ab513c98aed98 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 11:24:07 -0400 Subject: [PATCH 05/15] FIX: Try again [skip azp] [skip circle] --- .github/workflows/linux_conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index d4a9d427c5a..6b26b3ea537 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -47,7 +47,7 @@ jobs: run: ./tools/github_actions_install.sh name: 'Install MNE' - shell: bash -el {0} - run: LIBGL_DEBUG=verbose python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" + run: LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" name: 'Check Qt GL' - shell: bash -el {0} run: ./tools/github_actions_infos.sh From a4fb5bc4eeedd09b0c13c790f11b2503ac960f81 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 13:25:44 -0400 Subject: [PATCH 06/15] FIX: Try another --- tools/setup_xvfb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup_xvfb.sh b/tools/setup_xvfb.sh index 67d3dc83d01..60ac465b06f 100755 --- a/tools/setup_xvfb.sh +++ b/tools/setup_xvfb.sh @@ -11,5 +11,5 @@ done # This also includes the libraries necessary for PyQt5/PyQt6 sudo apt update -sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 +sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 libicu70 /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset From fef1a1b985d64dd3f3485f6885a355edcb73fbd2 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 13:27:39 -0400 Subject: [PATCH 07/15] FIX: Name --- tools/setup_xvfb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup_xvfb.sh b/tools/setup_xvfb.sh index 60ac465b06f..c2d163f5d97 100755 --- a/tools/setup_xvfb.sh +++ b/tools/setup_xvfb.sh @@ -11,5 +11,5 @@ done # This also includes the libraries necessary for PyQt5/PyQt6 sudo apt update -sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 libicu70 +sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 libicu /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset From d38294b635bdbacf68a8bcc90075ee7c7a6e09b6 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 13:28:50 -0400 Subject: [PATCH 08/15] FIX: Whatever --- tools/setup_xvfb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup_xvfb.sh b/tools/setup_xvfb.sh index c2d163f5d97..bbfa35e425d 100755 --- a/tools/setup_xvfb.sh +++ b/tools/setup_xvfb.sh @@ -11,5 +11,5 @@ done # This also includes the libraries necessary for PyQt5/PyQt6 sudo apt update -sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 libicu +sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 libicu-dev /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset From 0050a1eddaaf931c400129c921cd5b627e6089fc Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 14:25:22 -0400 Subject: [PATCH 09/15] WIP: Try again --- .github/workflows/linux_conda.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index 6b26b3ea537..5b6f2921cbc 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -47,7 +47,9 @@ jobs: run: ./tools/github_actions_install.sh name: 'Install MNE' - shell: bash -el {0} - run: LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" + run: | + sudo apt remove -y libegl1 + LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" name: 'Check Qt GL' - shell: bash -el {0} run: ./tools/github_actions_infos.sh From 4394b066ce63ac82592dda6a50b0c795b03a05e5 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 14:36:26 -0400 Subject: [PATCH 10/15] FIX: Try another --- .github/workflows/linux_conda.yml | 1 - tools/setup_xvfb.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index 5b6f2921cbc..a8b1629b4dd 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -48,7 +48,6 @@ jobs: name: 'Install MNE' - shell: bash -el {0} run: | - sudo apt remove -y libegl1 LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" name: 'Check Qt GL' - shell: bash -el {0} diff --git a/tools/setup_xvfb.sh b/tools/setup_xvfb.sh index bbfa35e425d..2da295aacad 100755 --- a/tools/setup_xvfb.sh +++ b/tools/setup_xvfb.sh @@ -11,5 +11,5 @@ done # This also includes the libraries necessary for PyQt5/PyQt6 sudo apt update -sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 libicu-dev +sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 libosmesa6 /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset From b7c064e44fe271a7ba281b0c50ffef502a3b9253 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 14:46:11 -0400 Subject: [PATCH 11/15] FIX: One more try [skip azp] [skip circle] --- .github/workflows/linux_conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index a8b1629b4dd..2ca52877a0c 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -48,7 +48,7 @@ jobs: name: 'Install MNE' - shell: bash -el {0} run: | - LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" + QT_DEBUG_PLUGINS=1 LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" name: 'Check Qt GL' - shell: bash -el {0} run: ./tools/github_actions_infos.sh From c783cdfcef1d24d065854d1a1f1443569795d921 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 14:47:40 -0400 Subject: [PATCH 12/15] FIX: Meaner --- .github/workflows/linux_conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index 2ca52877a0c..455e2bacb09 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -48,7 +48,7 @@ jobs: name: 'Install MNE' - shell: bash -el {0} run: | - QT_DEBUG_PLUGINS=1 LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" + QT_DEBUG_PLUGINS=1 QT_QPA_PLATFORM=xcb LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" name: 'Check Qt GL' - shell: bash -el {0} run: ./tools/github_actions_infos.sh From ed196b1266ce45447fad10856fa4de7b7f98cf7d Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 15:01:36 -0400 Subject: [PATCH 13/15] FIX: Another [skip azp] [skip circle] --- .github/workflows/linux_conda.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index 455e2bacb09..3b3eed99ec9 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -25,6 +25,7 @@ jobs: PYTHONUNBUFFERED: '1' PYTHON_VERSION: '3.10' MESA_GL_VERSION_OVERRIDE: '4.5FC' + MESA_GLES_VERSION_OVERRIDE: '3.2' steps: - uses: actions/checkout@v2 - run: ./tools/setup_xvfb.sh @@ -46,6 +47,15 @@ jobs: - shell: bash -el {0} run: ./tools/github_actions_install.sh name: 'Install MNE' + - shell: bash -el {0} + run: | + unset MESA_GL_VERSION_OVERRIDE + unset MESA_GLES_VERSION_OVERRIDE + glxinfo + name: glxinfo original + - shell: bash -el {0} + run: glxinfo + name: glxinfo updated - shell: bash -el {0} run: | QT_DEBUG_PLUGINS=1 QT_QPA_PLATFORM=xcb LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" From 5a86c915ddd50631abb09490f65d42c44fad6af7 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 15:08:32 -0400 Subject: [PATCH 14/15] FIX: glxinfo [skip azp] [skip circle] --- tools/setup_xvfb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup_xvfb.sh b/tools/setup_xvfb.sh index 2da295aacad..aca5ef6ef41 100755 --- a/tools/setup_xvfb.sh +++ b/tools/setup_xvfb.sh @@ -11,5 +11,5 @@ done # This also includes the libraries necessary for PyQt5/PyQt6 sudo apt update -sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 libosmesa6 +sudo apt install -yqq xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libopengl0 libegl1 libosmesa6 mesa-utils /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset From d6c4680e2937ba29f5d7e67d1637b51335328eb7 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Thu, 12 May 2022 15:45:32 -0400 Subject: [PATCH 15/15] MAINT: Give up --- .github/workflows/linux_conda.yml | 13 +------------ environment.yml | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/linux_conda.yml b/.github/workflows/linux_conda.yml index 3b3eed99ec9..2cf83895ce2 100644 --- a/.github/workflows/linux_conda.yml +++ b/.github/workflows/linux_conda.yml @@ -24,8 +24,6 @@ jobs: MKL_NUM_THREADS: '1' PYTHONUNBUFFERED: '1' PYTHON_VERSION: '3.10' - MESA_GL_VERSION_OVERRIDE: '4.5FC' - MESA_GLES_VERSION_OVERRIDE: '3.2' steps: - uses: actions/checkout@v2 - run: ./tools/setup_xvfb.sh @@ -49,16 +47,7 @@ jobs: name: 'Install MNE' - shell: bash -el {0} run: | - unset MESA_GL_VERSION_OVERRIDE - unset MESA_GLES_VERSION_OVERRIDE - glxinfo - name: glxinfo original - - shell: bash -el {0} - run: glxinfo - name: glxinfo updated - - shell: bash -el {0} - run: | - QT_DEBUG_PLUGINS=1 QT_QPA_PLATFORM=xcb LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" + QT_QPA_PLATFORM=xcb LIBGL_DEBUG=verbose LD_DEBUG=libs python -c "import pyvistaqt; pyvistaqt.BackgroundPlotter(show=True)" name: 'Check Qt GL' - shell: bash -el {0} run: ./tools/github_actions_infos.sh diff --git a/environment.yml b/environment.yml index 1c60e770850..5caa58223f4 100644 --- a/environment.yml +++ b/environment.yml @@ -38,7 +38,7 @@ dependencies: - nilearn - python-picard - qtpy -- pyqt +- pyqt!=5.15.3,!=5.15.4 - mne - mffpy>=0.5.7 - ipywidgets