Skip to content

Commit

Permalink
travis: install all conda dependencies at the same time
Browse files Browse the repository at this point in the history
fallen committed May 11, 2015
1 parent 0ca42db commit fb8ccbd
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ before_install:
- if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=0; fi
- ./.travis/get-toolchain.sh
- if [ $BUILD_SOC -ne 0 ]; then ./.travis/get-xilinx.sh; fi
- ./.travis/get-anaconda.sh pip coverage binstar
- ./.travis/get-anaconda.sh
- source $HOME/miniconda/bin/activate py34
- sudo apt-get install --force-yes -y iverilog
- conda install pip coverage binstar migen cython conda-build jinja2
- pip install coveralls
- conda install migen cython
install:
- conda build conda/artiq
- conda install $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2
3 changes: 1 addition & 2 deletions .travis/get-anaconda.sh
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ bash miniconda.sh -b -p $HOME/miniconda
hash -r
conda config --set always_yes yes --set changeps1 no
conda update -q conda
conda install conda-build jinja2
conda info -a
conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION $@
conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION
conda config --add channels fallen

0 comments on commit fb8ccbd

Please sign in to comment.