travis: install all conda dependencies at the same time

This commit is contained in:
Yann Sionneau 2015-05-11 09:33:30 +02:00
parent 0ca42dbdbe
commit fb8ccbd2a3
2 changed files with 3 additions and 4 deletions

View File

@ -13,11 +13,11 @@ before_install:
- if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=0; fi - if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=0; fi
- ./.travis/get-toolchain.sh - ./.travis/get-toolchain.sh
- if [ $BUILD_SOC -ne 0 ]; then ./.travis/get-xilinx.sh; fi - 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 - source $HOME/miniconda/bin/activate py34
- sudo apt-get install --force-yes -y iverilog - sudo apt-get install --force-yes -y iverilog
- conda install pip coverage binstar migen cython conda-build jinja2
- pip install coveralls - pip install coveralls
- conda install migen cython
install: install:
- conda build conda/artiq - conda build conda/artiq
- conda install $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2 - conda install $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2

View File

@ -5,7 +5,6 @@ bash miniconda.sh -b -p $HOME/miniconda
hash -r hash -r
conda config --set always_yes yes --set changeps1 no conda config --set always_yes yes --set changeps1 no
conda update -q conda conda update -q conda
conda install conda-build jinja2
conda info -a 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 conda config --add channels fallen