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

conda: unbreak channel lists in environment descriptions

This commit is contained in:
Sebastien Bourdeauducq 2017-06-06 15:57:38 +08:00
parent e938b35e8e
commit 70a3b66c76
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conda/artiq-dev.yaml
View File

@ -2,8 +2,9 @@
# $ conda env create -f conda/artiq-dev.yaml # $ conda env create -f conda/artiq-dev.yaml
name: artiq-dev name: artiq-dev
channels: channels:
- m-labs/label/main
- m-labs/label/dev
- defaults - defaults
- conda-forge/label/main
- m-labs/label/dev
- m-labs/label/main
dependencies: dependencies:
- artiq-dev - artiq-dev

3
conda/artiq-doc.yaml
View File

@ -2,9 +2,10 @@
# $ conda env create -f conda/artiq-doc.yaml # $ conda env create -f conda/artiq-doc.yaml
name: artiq-doc name: artiq-doc
channels: channels:
- defaults
- conda-forge/label/main
- m-labs/label/dev - m-labs/label/dev
- m-labs/label/main - m-labs/label/main
- defaults
dependencies: dependencies:
- python>=3.5.3,<3.6 - python>=3.5.3,<3.6
- sphinx=1.4.8 - sphinx=1.4.8