Skip to content

Commit

Permalink
Merge pull request #71 from lukeyeager/nvidia/fix-py3-travis-boost
Browse files Browse the repository at this point in the history
Cherry-pick TravisCI python3 fix
  • Loading branch information
lukeyeager committed Nov 5, 2015
2 parents 6804029 + 4f02a0b commit 62ad22d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions scripts/travis/travis_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 62ad22d

Please sign in to comment.