From fb8ccbd2a39987b5198b532b619c77ef8d5b995a Mon Sep 17 00:00:00 2001
From: Yann Sionneau <ys@m-labs.hk>
Date: Mon, 11 May 2015 09:33:30 +0200
Subject: [PATCH] travis: install all conda dependencies at the same time

---
 .travis.yml             | 4 ++--
 .travis/get-anaconda.sh | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec74890df..d6eae7023 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh
index 7894d0dc4..04e050441 100755
--- a/.travis/get-anaconda.sh
+++ b/.travis/get-anaconda.sh
@@ -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