Merge branch 'master' of https://github.com/m-labs/migen

2015-05-12 16:16:24 +02:00 · 2015-05-12 16:16:24 +02:00 · b0f159421c
parent 88a406ebec 9194fe43a1
commit b0f159421c
1 changed files with 2 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -10,8 +10,9 @@ before_install:
  # Install Miniconda
  - wget https://raw.githubusercontent.com/m-labs/artiq/master/.travis/get-anaconda.sh
  - chmod +x get-anaconda.sh
-  - ./get-anaconda.sh binstar numpydoc
+  - ./get-anaconda.sh
  - source $HOME/miniconda/bin/activate py34
+  - conda install binstar numpydoc
 install:
  # Install iverilog package.
  - "sudo add-apt-repository -y ppa:mithro/iverilog-backport"