projects
/
platform
/
upstream
/
caffeonacl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3c00040
)
[travis] fix boost/python3 conda conflict
author
Jonathan L Long
<jonlong@cs.berkeley.edu>
Thu, 5 Nov 2015 06:10:25 +0000
(22:10 -0800)
committer
Jonathan L Long
<jonlong@cs.berkeley.edu>
Thu, 5 Nov 2015 06:27:14 +0000
(22:27 -0800)
scripts/travis/travis_install.sh
patch
|
blob
|
history
diff --git
a/scripts/travis/travis_install.sh
b/scripts/travis/travis_install.sh
index
d78c4d2
..
432c81d
100755
(executable)
--- 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