diff options
| author | Jonathan L Long <jonlong@cs.berkeley.edu> | 2015-11-04 22:10:25 -0800 |
|---|---|---|
| committer | Jonathan L Long <jonlong@cs.berkeley.edu> | 2015-11-04 22:27:14 -0800 |
| commit | 5196926a7cca1a85aecbd97e78452352fc5d2b3d (patch) | |
| tree | 96d730807fdab78883bf58e5d7df8a50d6fb1481 /scripts | |
| parent | 3c00040256d0f58358a90c8ef041e4a065a9030b (diff) | |
| download | caffeonacl-5196926a7cca1a85aecbd97e78452352fc5d2b3d.tar.gz caffeonacl-5196926a7cca1a85aecbd97e78452352fc5d2b3d.tar.bz2 caffeonacl-5196926a7cca1a85aecbd97e78452352fc5d2b3d.zip | |
[travis] fix boost/python3 conda conflict
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis/travis_install.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/travis/travis_install.sh b/scripts/travis/travis_install.sh index d78c4d2f..432c81dc 100755 --- a/scripts/travis/travis_install.sh +++ b/scripts/travis/travis_install.sh @@ -70,6 +70,10 @@ if [ ! -d $CONDA_DIR ]; then ./miniconda.sh -b -p $CONDA_DIR conda update --yes conda + # The version of boost we're using for Python 3 depends on 3.4 for now. + if [ "$PYTHON_VERSION" -eq "3" ]; then + conda install --yes python=3.4 + fi conda install --yes numpy scipy matplotlib scikit-image pip # Let conda install boost (so that boost_python matches) conda install --yes -c https://conda.binstar.org/menpo boost=1.56.0 |