Merge pull request #6922 from radarhere/dependencies

Sort dependencies
python-pillow · Jan 31, 2023 · f82546f · f82546f
2 parents 76478c6 + 9932d0c
commit f82546f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml
@@ -34,18 +34,34 @@ jobs:
         with:
           platform: x86_64
           packages: >
-            ImageMagick gcc-g++ ghostscript jpeg libfreetype-devel
-            libimagequant-devel libjpeg-devel liblapack-devel
-            liblcms2-devel libopenjp2-devel libraqm-devel
-            libtiff-devel libwebp-devel libxcb-devel libxcb-xinerama0
-            make netpbm perl
+            gcc-g++
+            ghostscript
+            ImageMagick
+            jpeg
+            libfreetype-devel
+            libimagequant-devel
+            libjpeg-devel
+            liblapack-devel
+            liblcms2-devel
+            libopenjp2-devel
+            libraqm-devel
+            libtiff-devel
+            libwebp-devel
+            libxcb-devel
+            libxcb-xinerama0
+            make
+            netpbm
+            perl
             python3${{ matrix.python-minor-version }}-cffi
             python3${{ matrix.python-minor-version }}-cython
             python3${{ matrix.python-minor-version }}-devel
             python3${{ matrix.python-minor-version }}-numpy
             python3${{ matrix.python-minor-version }}-sip
             python3${{ matrix.python-minor-version }}-tkinter
-            qt5-devel-tools subversion xorg-server-extra zlib-devel
+            qt5-devel-tools
+            subversion
+            xorg-server-extra
+            zlib-devel
 
       - name: Add Lapack to PATH
         uses: egor-tensin/cleanup-path@v3

diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml
@@ -45,11 +45,6 @@ jobs:
       - name: Install dependencies
         run: |
           pacman -S --noconfirm \
-              ${{ matrix.package }}-python3-cffi \
-              ${{ matrix.package }}-python3-numpy \
-              ${{ matrix.package }}-python3-olefile \
-              ${{ matrix.package }}-python3-pip \
-              ${{ matrix.package }}-python3-setuptools \
               ${{ matrix.package }}-freetype \
               ${{ matrix.package }}-gcc \
               ${{ matrix.package }}-ghostscript \
@@ -60,6 +55,11 @@ jobs:
               ${{ matrix.package }}-libtiff \
               ${{ matrix.package }}-libwebp \
               ${{ matrix.package }}-openjpeg2 \
+              ${{ matrix.package }}-python3-cffi \
+              ${{ matrix.package }}-python3-numpy \
+              ${{ matrix.package }}-python3-olefile \
+              ${{ matrix.package }}-python3-pip \
+              ${{ matrix.package }}-python3-setuptools \
               subversion
 
           if [ ${{ matrix.package }} == "mingw-w64-x86_64" ]; then