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

conda: sync artiq/artiq-dev dependencies

pull/922/head
Robert Jördens 2018-01-30 08:36:55 +01:00
parent 9fca7b8faa
commit 4c22d64ee4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
conda/artiq/meta.yaml
View File

@ -27,9 +27,9 @@ 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+git1
- openocd 0.10.0 4
- lit
- outputcheck
- scipy