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: