]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - jacinto-ai/caffe-jacinto.git/commitdiff
[travis] fix boost/python3 conda conflict
authorJonathan L Long <jonlong@cs.berkeley.edu>
Thu, 5 Nov 2015 06:10:25 +0000 (22:10 -0800)
committerJonathan L Long <jonlong@cs.berkeley.edu>
Thu, 5 Nov 2015 06:27:14 +0000 (22:27 -0800)
scripts/travis/travis_install.sh

index d78c4d2f7b2985a551fa64db99497ecee768380b..432c81dc6ecb9422ef1aa8a1e68ce94f15f3ae36 100755 (executable)
@@ -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