python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-10 00:20:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4891 from nulano/revert-4832

Browse Source
This commit is contained in:
Hugo van Kemenade 2020-08-31 08:53:19 +03:00 committed by GitHub
commit 280eb84c2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.github/workflows/test-windows.yml vendored
View File

@ -198,15 +198,27 @@ jobs:
msys: msys:
runs-on: windows-2019 runs-on: windows-2019
strategy:
fail-fast: false
matrix:
mingw: ["MINGW32", "MINGW64"]
include:
- mingw: "MINGW32"
name: "MSYS2 MinGW 32-bit"
package: "mingw-w64-i686"
- mingw: "MINGW64"
name: "MSYS2 MinGW 64-bit"
package: "mingw-w64-x86_64"
defaults: defaults:
run: run:
shell: bash.exe --login -eo pipefail "{0}" shell: bash.exe --login -eo pipefail "{0}"
env: env:
MSYSTEM: MINGW64 MSYSTEM: ${{ matrix.mingw }}
CHERE_INVOKING: 1 CHERE_INVOKING: 1
timeout-minutes: 30 timeout-minutes: 30
name: MSYS2 MinGW 64-bit name: ${{ matrix.name }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -218,22 +230,22 @@ jobs:
- name: Install Dependencies - name: Install Dependencies
run: | run: |
pacman -S --noconfirm \ pacman -S --noconfirm \
mingw-w64-x86_64-python3-cffi \ ${{ matrix.package }}-python3-cffi \
mingw-w64-x86_64-python3-numpy \ ${{ matrix.package }}-python3-numpy \
mingw-w64-x86_64-python3-olefile \ ${{ matrix.package }}-python3-olefile \
mingw-w64-x86_64-python3-pip \ ${{ matrix.package }}-python3-pip \
mingw-w64-x86_64-python3-pyqt5 \ ${{ matrix.package }}-python3-pyqt5 \
mingw-w64-x86_64-python3-pytest \ ${{ matrix.package }}-python3-pytest \
mingw-w64-x86_64-python3-pytest-cov \ ${{ matrix.package }}-python3-pytest-cov \
mingw-w64-x86_64-python3-setuptools \ ${{ matrix.package }}-python3-setuptools \
mingw-w64-x86_64-freetype \ ${{ matrix.package }}-freetype \
mingw-w64-x86_64-ghostscript \ ${{ matrix.package }}-ghostscript \
mingw-w64-x86_64-lcms2 \ ${{ matrix.package }}-lcms2 \
mingw-w64-x86_64-libimagequant \ ${{ matrix.package }}-libimagequant \
mingw-w64-x86_64-libjpeg-turbo \ ${{ matrix.package }}-libjpeg-turbo \
mingw-w64-x86_64-libraqm \ ${{ matrix.package }}-libraqm \
mingw-w64-x86_64-libwebp \ ${{ matrix.package }}-libwebp \
mingw-w64-x86_64-openjpeg2 \ ${{ matrix.package }}-openjpeg2 \
subversion subversion
python3 -m pip install pyroma python3 -m pip install pyroma
@ -255,4 +267,4 @@ jobs:
python3 -m pip install codecov python3 -m pip install codecov
bash <(curl -s https://codecov.io/bash) -F GHA_Windows bash <(curl -s https://codecov.io/bash) -F GHA_Windows
env: env:
CODECOV_NAME: MSYS2 MinGW 64-bit CODECOV_NAME: ${{ matrix.name }}

4
docs/installation.rst
View File

@ -412,12 +412,12 @@ These platforms are built and tested for every change.
| Windows Server 2016 | 3.8 |x86 | | Windows Server 2016 | 3.8 |x86 |
| +--------------------------+-----------------------+ | +--------------------------+-----------------------+
| | 3.6 |x86-64 | | | 3.6 |x86-64 |
| +--------------------------+-----------------------+
| | 3.7/MinGW |x86 |
+----------------------------------+--------------------------+-----------------------+ +----------------------------------+--------------------------+-----------------------+
| Windows Server 2019 | 3.6, 3.7, 3.8 |x86, x86-64 | | Windows Server 2019 | 3.6, 3.7, 3.8 |x86, x86-64 |
| +--------------------------+-----------------------+ | +--------------------------+-----------------------+
| | PyPy3 |x86 | | | PyPy3 |x86 |
| +--------------------------+-----------------------+
| | 3.8/MinGW |x86, x86-64 |
+----------------------------------+--------------------------+-----------------------+ +----------------------------------+--------------------------+-----------------------+