From c919db11a8d074a03e904dd9919d520d8d4b1584 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 7 May 2022 22:32:46 +1000 Subject: [PATCH 1/3] Install cffi --- .ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/install.sh b/.ci/install.sh index 6d6894566..c588af42f 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -27,6 +27,7 @@ fi python3 -m pip install --upgrade pip python3 -m pip install --upgrade wheel +PYTHONOPTIMIZE=0 python3 -m pip install cffi python3 -m pip install coverage python3 -m pip install defusedxml python3 -m pip install olefile @@ -37,7 +38,6 @@ python3 -m pip install pyroma python3 -m pip install test-image-results if [[ $(uname) != CYGWIN* ]]; then - PYTHONOPTIMIZE=0 python3 -m pip install cffi # TODO Remove condition when NumPy supports 3.11 if ! [ "$GHA_PYTHON_VERSION" == "3.11-dev" ]; then python3 -m pip install numpy ; fi From 035e95551d0221083998d7cb4d52f02b03beadb1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 8 May 2022 21:30:42 +1000 Subject: [PATCH 2/3] Use build.sh --- .ci/build.sh | 2 +- .github/workflows/test-cygwin.yml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.ci/build.sh b/.ci/build.sh index a2e3041bd..e678f68ec 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -2,7 +2,7 @@ set -e -coverage erase +python3 -m coverage erase if [ $(uname) == "Darwin" ]; then export CPPFLAGS="-I/usr/local/miniconda/include"; fi diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml index a656d64c5..a2795b088 100644 --- a/.github/workflows/test-cygwin.yml +++ b/.github/workflows/test-cygwin.yml @@ -69,10 +69,7 @@ jobs: - name: Build shell: bash.exe -eo pipefail -o igncr "{0}" run: | - python3 -m coverage erase - make clean - CFLAGS="-coverage -Werror=implicit-function-declaration" python3 -m pip install -v --global-option="build_ext" . - python3 selftest.py + bash.exe .ci/build.sh - name: Test run: | From 0c7868b8cde901092c6dc08615c7cb2d9b2be2d9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 8 May 2022 21:40:46 +1000 Subject: [PATCH 3/3] Added Cygwin badge --- README.md | 3 +++ docs/index.rst | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/README.md b/README.md index 7bff737a2..5e9adaf7e 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,9 @@ As of 2019, Pillow development is GitHub Actions build status (Test MinGW) + GitHub Actions build status (Test Cygwin) GitHub Actions build status (Test Docker) diff --git a/docs/index.rst b/docs/index.rst index f1a721c6a..5e886c2e8 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -29,6 +29,10 @@ Pillow for enterprise is available via the Tidelift Subscription. `Learn more