BF: fixes from first travis run

This commit is contained in:
Matthew Brett 2014-06-28 18:31:38 +01:00
parent 535e89663a
commit 837f755c37
3 changed files with 8 additions and 6 deletions

View File

@ -3,9 +3,9 @@ language:
env: env:
matrix: matrix:
- VERSION=2.7.7 NUMPY_VERSION=1.6.0 - VERSION=2.7.7
- VERSION=3.3.5 NUMPY_VERSION=1.7.1 - VERSION=3.3.5
- VERSION=3.4.1 NUMPY_VERSION=1.7.1 - VERSION=3.4.1
install: install:
- source run_install.sh - source run_install.sh
@ -22,7 +22,7 @@ script:
- python selftest.py --installed - python selftest.py --installed
- cd .. - cd ..
before_deploy: cd scikit-image/dist before_deploy: cd Pillow/dist
deploy: deploy:
provider: cloudfiles provider: cloudfiles
username: travis-worker username: travis-worker

View File

@ -49,8 +49,8 @@ function init_vars {
SRC_PREFIX=$PWD/working SRC_PREFIX=$PWD/working
BUILD_PREFIX=$PWD/build BUILD_PREFIX=$PWD/build
export PATH=$BUILD_PREFIX/bin:$PATH export PATH=$BUILD_PREFIX/bin:$PATH
CPATH=$BUILD_PREFIX/include export CPATH=$BUILD_PREFIX/include
LIBRARY_PATH=$BUILD_PREFIX/lib export LIBRARY_PATH=$BUILD_PREFIX/lib
} }

View File

@ -10,6 +10,8 @@ install_tiff
install_libpng install_libpng
install_lcms2 install_lcms2
install_webp install_webp
# Need cmake for openjpeg
brew install cmake
install_openjpeg install_openjpeg
# Fix openjpeg library install id # Fix openjpeg library install id
install_name_tool -id $PWD/build/lib/libopenjp2.6.dylib build/lib/libopenjp2.2.0.0.dylib install_name_tool -id $PWD/build/lib/libopenjp2.6.dylib build/lib/libopenjp2.2.0.0.dylib