FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[travis] fix boost/python3 conda conflict · tzhang2014/CaffeOnACL@5196926 · GitHub

Repository navigation

Commit 5196926

Browse files
committed
[travis] fix boost/python3 conda conflict
1 parent 3c00040 commit 5196926

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

‎scripts/travis/travis_install.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ if [ ! -d $CONDA_DIR ]; then
7070
./miniconda.sh -b -p $CONDA_DIR
7171

7272
conda update --yes conda
73+
# The version of boost we're using for Python 3 depends on 3.4 for now.
74+
if [ "$PYTHON_VERSION" -eq "3" ]; then
75+
conda install --yes python=3.4
76+
fi
7377
conda install --yes numpy scipy matplotlib scikit-image pip
7478
# Let conda install boost (so that boost_python matches)
7579
conda install --yes -c https://conda.binstar.org/menpo boost=1.56.0

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL