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

conda: use anaconda default pyqt (fixes #670)

This commit is contained in:
Chris Ballance 2017-02-28 10:38:46 +00:00
parent 9cfa3e704b
commit 34421ee2f4
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 - sphinx_rtd_theme
- h5py - h5py
- dateutil - dateutil
- pyqt5 - pyqt
- quamash - quamash
- pyqtgraph - pyqtgraph
- pygit2 - pygit2

2
conda/artiq/meta.yaml
View File

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