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

conda: sync artiq and artiq-dev 

c.f. 4c22d64e
This commit is contained in:
Robert Jördens 2018-01-30 11:03:55 +01:00
parent e1aafcbb4f
commit 49a265453d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conda/artiq-dev/meta.yaml
View File

@ -37,7 +37,7 @@ requirements:
- python-dateutil
- pyqt >=5.5
- quamash
- pyqtgraph
- pyqtgraph 0.10.0
- pygit2
- aiohttp
- pythonparser >=1.1

2
conda/artiq/meta.yaml
View File

@ -27,7 +27,7 @@ requirements:
run:
- python >=3.5.3,<3.6
- llvmlite-artiq 0.20.0
- binutils-or1k-linux
- binutils-or1k-linux >=2.27
- pythonparser >=1.1
- openocd ==0.10.0
- lit