@@ -13,18 +13,14 @@ aptget_update()
1313 return 1
1414 fi
1515}
16- if [[ $( uname) != CYGWIN* ]]; then
17- aptget_update || aptget_update retry || aptget_update retry
18- fi
16+ aptget_update || aptget_update retry || aptget_update retry
1917
2018set -e
2119
22- if [[ $( uname) != CYGWIN* ]]; then
23- sudo apt-get -qq install libfreetype6-dev liblcms2-dev libtiff-dev python3-tk\
24- ghostscript libjpeg-turbo8-dev libopenjp2-7-dev\
25- cmake meson imagemagick libharfbuzz-dev libfribidi-dev\
26- sway wl-clipboard libopenblas-dev nasm
27- fi
20+ sudo apt-get -qq install libfreetype6-dev liblcms2-dev libtiff-dev python3-tk\
21+ ghostscript libjpeg-turbo8-dev libopenjp2-7-dev\
22+ cmake meson imagemagick libharfbuzz-dev libfribidi-dev\
23+ sway wl-clipboard libopenblas-dev nasm
2824
2925python3 -m pip install --upgrade pip
3026python3 -m pip install --upgrade wheel
@@ -40,36 +36,27 @@ python3 -m pip install pyroma
4036# fails on beta 3.14 and PyPy
4137python3 -m pip install --only-binary=:all: pyarrow || true
4238
43- if [[ $( uname) != CYGWIN* ]]; then
44- python3 -m pip install numpy
4539
46- # PyQt6 doesn't support PyPy3
47- if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
48- sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0
49- # TODO Update condition when pyqt6 supports free-threading
50- if ! [[ " $PYTHON_GIL " == " 0" ]]; then python3 -m pip install pyqt6 ; fi
51- fi
40+ python3 -m pip install numpy
5241
53- # Pyroma uses non-isolated build and fails with old setuptools
54- if [[ $GHA_PYTHON_VERSION == 3.9 ]]; then
55- # To match pyproject.toml
56- python3 -m pip install " setuptools>=77"
57- fi
42+ # PyQt6 doesn't support PyPy3
43+ if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
44+ sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0
45+ # TODO Update condition when pyqt6 supports free-threading
46+ if ! [[ " $PYTHON_GIL " == " 0" ]]; then python3 -m pip install pyqt6 ; fi
47+ fi
5848
59- # webp
60- pushd depends && ./install_webp.sh && popd
49+ # webp
50+ pushd depends && ./install_webp.sh && popd
6151
62- # libimagequant
63- pushd depends && ./install_imagequant.sh && popd
52+ # libimagequant
53+ pushd depends && ./install_imagequant.sh && popd
6454
65- # raqm
66- pushd depends && ./install_raqm.sh && popd
55+ # raqm
56+ pushd depends && ./install_raqm.sh && popd
6757
68- # libavif
69- pushd depends && ./install_libavif.sh && popd
58+ # libavif
59+ pushd depends && ./install_libavif.sh && popd
7060
71- # extra test images
72- pushd depends && ./install_extra_test_images.sh && popd
73- else
74- cd depends && ./install_extra_test_images.sh && cd ..
75- fi
61+ # extra test images
62+ pushd depends && ./install_extra_test_images.sh && popd
0 commit comments