From 0f9bc7bc4bbc26ff256d320d7b64bbfcfe6f8c50 Mon Sep 17 00:00:00 2001
From: Yann Sionneau <ys@m-labs.hk>
Date: Tue, 12 May 2015 13:56:29 +0200
Subject: [PATCH] travis: conda-build and jinja2 must be installed in the root
 environment

---
 .travis.yml             | 2 +-
 .travis/get-anaconda.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d6eae7023..8fa5ccfb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ before_install:
   - ./.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
+  - conda install pip coverage binstar migen cython
   - pip install coveralls
 install:
   - conda build conda/artiq
diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh
index 04e050441..9e746e616 100755
--- a/.travis/get-anaconda.sh
+++ b/.travis/get-anaconda.sh
@@ -6,5 +6,6 @@ hash -r
 conda config --set always_yes yes --set changeps1 no
 conda update -q conda
 conda info -a
+conda install conda-build jinja2
 conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION
 conda config --add channels fallen