From 5105a3a510b63a90b9ca70b36b806b5ab2f491a7 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Thu, 3 Sep 2026 15:54:25 +0300 Subject: [PATCH 1/5] Remove seemingly stray openblas config for mac CI --- .github/workflows/macos-install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index e95a786d758..a63a82b2cce 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -3,7 +3,6 @@ set -e brew bundle --file=.github/workflows/Brewfile -export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig" python3 -m pip install coverage python3 -m pip install defusedxml From 0ffd71dbb946914eb186b8b8422d1f0cae05f279 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Thu, 3 Sep 2026 15:37:18 +0300 Subject: [PATCH 2/5] Install apt packages in CI in one invocation --- .ci/install.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index cd2bf93931f..af7b379f94e 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -17,10 +17,17 @@ aptget_update || aptget_update retry || aptget_update retry set -e -sudo apt-get -qq install libfreetype6-dev liblcms2-dev libtiff-dev python3-tk\ - ghostscript libjpeg-turbo8-dev libopenjp2-7-dev\ - cmake meson imagemagick libharfbuzz-dev libfribidi-dev\ - sway wl-clipboard libopenblas-dev nasm +packages=(libfreetype6-dev liblcms2-dev libtiff-dev python3-tk + ghostscript libjpeg-turbo8-dev libopenjp2-7-dev + cmake meson imagemagick libharfbuzz-dev libfribidi-dev + sway wl-clipboard libopenblas-dev nasm) + +# PyQt6 doesn't support PyPy3 +if [[ $GHA_PYTHON_VERSION == 3.* ]]; then + packages+=(libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 + libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0) +fi +sudo apt-get -qq install "${packages[@]}" python3 -m pip install --upgrade pip python3 -m pip install --upgrade wheel From 5d5472572d4ee0f17296c3356ca9d0118ef283aa Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Thu, 3 Sep 2026 15:37:17 +0300 Subject: [PATCH 3/5] Adjust packages installed by apt in CI - add `--no-install-recommends` - libopenblas-dev doesn't seem to be required - add netpbm explicitly - note why imagemagick is needed --- .ci/install.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index af7b379f94e..b7300451b48 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -19,15 +19,19 @@ set -e packages=(libfreetype6-dev liblcms2-dev libtiff-dev python3-tk ghostscript libjpeg-turbo8-dev libopenjp2-7-dev - cmake meson imagemagick libharfbuzz-dev libfribidi-dev - sway wl-clipboard libopenblas-dev nasm) + cmake meson libharfbuzz-dev libfribidi-dev + sway wl-clipboard nasm + # ImageMagick is used by Tests/test_file_palm.py + imagemagick + # netpbm provides ppmquant and ppmtogif for GifImagePlugin._save_netpbm + netpbm) # PyQt6 doesn't support PyPy3 if [[ $GHA_PYTHON_VERSION == 3.* ]]; then packages+=(libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0) fi -sudo apt-get -qq install "${packages[@]}" +sudo apt-get -qq install --no-install-recommends "${packages[@]}" python3 -m pip install --upgrade pip python3 -m pip install --upgrade wheel From c1917d2956db079cde63528b16a60119f58cf38c Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Thu, 3 Sep 2026 15:51:33 +0300 Subject: [PATCH 4/5] Install Python packages in one batch (sans wheel) --- .ci/install.sh | 10 ++-------- .github/workflows/macos-install.sh | 9 ++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index b7300451b48..bfb2f8ea0c6 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -34,14 +34,8 @@ fi sudo apt-get -qq install --no-install-recommends "${packages[@]}" python3 -m pip install --upgrade pip -python3 -m pip install --upgrade wheel -python3 -m pip install coverage -python3 -m pip install defusedxml -python3 -m pip install ipython -python3 -m pip install olefile -python3 -m pip install -U pytest -python3 -m pip install -U pytest-cov -python3 -m pip install -U pytest-timeout +python3 -m pip install --upgrade coverage defusedxml ipython olefile pytest pytest-cov pytest-timeout + # optional test dependencies, only install if there's a binary package. python3 -m pip install --only-binary=:all: numpy || true python3 -m pip install --only-binary=:all: pyarrow || true diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index a63a82b2cce..cfa7f8e0ec4 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -4,13 +4,8 @@ set -e brew bundle --file=.github/workflows/Brewfile -python3 -m pip install coverage -python3 -m pip install defusedxml -python3 -m pip install ipython -python3 -m pip install olefile -python3 -m pip install -U pytest -python3 -m pip install -U pytest-cov -python3 -m pip install -U pytest-timeout +python3 -m pip install --upgrade coverage defusedxml ipython olefile pytest pytest-cov pytest-timeout + # optional test dependencies, only install if there's a binary package. python3 -m pip install --only-binary=:all: numpy || true python3 -m pip install --only-binary=:all: pyarrow || true From 5d3247e57b7ab88d5fe0df78ca98007487213761 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Sun, 6 Sep 2026 05:17:00 +1000 Subject: [PATCH 5/5] Do not install PyQt6 dependencies --- .ci/install.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index bfb2f8ea0c6..1832e427898 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -25,12 +25,6 @@ packages=(libfreetype6-dev liblcms2-dev libtiff-dev python3-tk imagemagick # netpbm provides ppmquant and ppmtogif for GifImagePlugin._save_netpbm netpbm) - -# PyQt6 doesn't support PyPy3 -if [[ $GHA_PYTHON_VERSION == 3.* ]]; then - packages+=(libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 - libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0) -fi sudo apt-get -qq install --no-install-recommends "${packages[@]}" python3 -m pip install --upgrade pip