M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

Revert "travis: use main conda m-labs channel." 

This reverts commit 87b573c813.
This commit is contained in:
whitequark 2015-10-09 20:17:57 +03:00
parent a9230d33f2
commit db061bc43d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/get-anaconda.sh
View File

@ -10,4 +10,4 @@ conda update -q conda
conda info -a conda info -a
conda install conda-build jinja2 conda install conda-build jinja2
conda create -q -n py35 python=$TRAVIS_PYTHON_VERSION 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

2
conda/artiq/meta.yaml
View File

@ -31,7 +31,7 @@ requirements:
- python >=3.5.0 - python >=3.5.0
- setuptools - setuptools
- numpy - numpy
- migen - migen 0.0
- pyelftools - pyelftools
- binutils-or1k-linux - binutils-or1k-linux
run: run: