From db061bc43dc8047529e69ec4852122f5b039a3cb Mon Sep 17 00:00:00 2001 From: whitequark Date: Fri, 9 Oct 2015 20:17:57 +0300 Subject: [PATCH] Revert "travis: use main conda m-labs channel." This reverts commit 87b573c8131d1961d466428a9ad9a5f69d20bf57. --- .travis/get-anaconda.sh | 2 +- conda/artiq/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh index bf76e2fa3..790a723ad 100755 --- a/.travis/get-anaconda.sh +++ b/.travis/get-anaconda.sh @@ -10,4 +10,4 @@ conda update -q conda conda info -a conda install conda-build jinja2 conda create -q -n py35 python=$TRAVIS_PYTHON_VERSION -conda config --add channels https://conda.anaconda.org/m-labs/channel/main +conda config --add channels https://conda.anaconda.org/m-labs/channel/dev diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 6dacc0293..e96b8d4bb 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -31,7 +31,7 @@ requirements: - python >=3.5.0 - setuptools - numpy - - migen + - migen 0.0 - pyelftools - binutils-or1k-linux run: