Updated travis osx_image to 9.4

This commit is contained in:
Andrew Murray 2018-10-13 21:54:45 +11:00
parent 5008a37c0e
commit 9f2c20cd66
2 changed files with 14 additions and 1 deletions

View File

@ -6,6 +6,7 @@ env:
- UNICODE_WIDTH=32 - UNICODE_WIDTH=32
- BUILD_DEPENDS="" - BUILD_DEPENDS=""
- TEST_DEPENDS="pytest pytest-cov numpy scipy" - TEST_DEPENDS="pytest pytest-cov numpy scipy"
- MACOSX_DEPLOYMENT_TARGET=10.10
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
# Following generated with # Following generated with
# travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key> # travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
@ -17,7 +18,7 @@ python: 3.5
sudo: required sudo: required
dist: trusty dist: trusty
services: docker services: docker
osx_image: xcode6.4 osx_image: xcode9.4
matrix: matrix:
exclude: exclude:

View File

@ -34,7 +34,19 @@ function pre_build {
install_name_tool -id $BUILD_PREFIX/lib/libopenjp2.7.dylib $BUILD_PREFIX/lib/libopenjp2.2.1.0.dylib install_name_tool -id $BUILD_PREFIX/lib/libopenjp2.7.dylib $BUILD_PREFIX/lib/libopenjp2.2.1.0.dylib
fi fi
build_lcms2 build_lcms2
if [ -n "$IS_OSX" ]; then
# Custom flags to allow building on OS X 10.10 and 10.11
build_giflib
ORIGINAL_CPPFLAGS=$CPPFLAGS
CPPFLAGS=""
fi
build_libwebp build_libwebp
if [ -n "$IS_OSX" ]; then
CPPFLAGS=$ORIGINAL_CPPFLAGS
fi
if [ -n "$IS_OSX" ]; then if [ -n "$IS_OSX" ]; then
# Custom freetype build # Custom freetype build
build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no