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

Merge branch 'use_default_pyqt' of https://github.com/cjbe/artiq 

* 'use_default_pyqt' of https://github.com/cjbe/artiq:
  conda: use anaconda default pyqt (fixes #670)
This commit is contained in:
Robert Jördens 2017-02-28 13:21:13 +01:00
parent 3af29f7a59 34421ee2f4
commit fca315235c
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

@ -36,7 +36,7 @@ requirements:
- sphinx_rtd_theme
- h5py
- dateutil
- pyqt5
- pyqt
- quamash
- pyqtgraph
- pygit2

2
conda/artiq/meta.yaml
View File

@ -28,7 +28,7 @@ requirements:
- asyncserial
- h5py
- dateutil
- pyqt5
- pyqt
- quamash
- pyqtgraph
- pygit2