From 44b525e709d91ace3b57b30cffb157782787f647 Mon Sep 17 00:00:00 2001 From: Andrew Chin Date: Sat, 21 Apr 2018 15:18:59 -0400 Subject: [PATCH] During windows CI builds, use a specific Pillow This is because we build against a fixed PIL_INCLUDE_DIR whos version needs to match the python version we install Note: CI builds for windows use a hard-coded path for PIL. I manually updated this to version 5.1.0 TODO@achin: automatically download the right version of pillow src --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ecd4fb4..3633162 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,9 +36,9 @@ build:windows: - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - set DISTUTILS_USE_SDK=1 - set MSSdk=1 - - set PIL_INCLUDE_DIR=c:\devel\pillow\libImaging + - set PIL_INCLUDE_DIR=c:\devel\pillow\src\libImaging - c:\Python27\python.exe c:\devel\virtualenv\virtualenv.py ci_env - - ci_env\scripts\pip.exe install numpy Pillow + - ci_env\scripts\pip.exe install numpy Pillow==5.1.0 - ci_env\Scripts\python.exe setup.py build - ci_env\Scripts\python.exe overviewer.py --verbose --version @@ -223,9 +223,9 @@ package:win64: - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - set DISTUTILS_USE_SDK=1 - set MSSdk=1 - - set PIL_INCLUDE_DIR=c:\devel\pillow\libImaging + - set PIL_INCLUDE_DIR=c:\devel\pillow\src\libImaging - c:\Python27\python.exe c:\devel\virtualenv\virtualenv.py ci_env - - ci_env\scripts\pip.exe install numpy Pillow pyinstaller sphinx + - ci_env\scripts\pip.exe install numpy Pillow==5.10 pyinstaller sphinx - ci_env\Scripts\python.exe setup.py build - copy build-tools\overviewer.spec . - ci_env\Scripts\pyinstaller.exe overviewer.spec @@ -247,9 +247,9 @@ package:win32: - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - set DISTUTILS_USE_SDK=1 - set MSSdk=1 - - set PIL_INCLUDE_DIR=c:\devel\pillow\libImaging + - set PIL_INCLUDE_DIR=c:\devel\pillow\src\libImaging - "\"c:\\Python27 (x86)\\python.exe\" c:\\devel\\virtualenv\\virtualenv.py ci_env" - - ci_env\scripts\pip.exe install numpy Pillow pyinstaller sphinx + - ci_env\scripts\pip.exe install numpy Pillow==5.1.0 pyinstaller sphinx - ci_env\Scripts\python.exe setup.py build - copy build-tools\overviewer.spec . - ci_env\Scripts\pyinstaller.exe overviewer.spec