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)
2017-02-28 13:21:13 +01:00 · 2017-02-28 13:21:13 +01:00 · fca315235c
parent 3af29f7a59 34421ee2f4
commit fca315235c
2 changed files with 2 additions and 2 deletions
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@ -36,7 +36,7 @@ requirements:
    - sphinx_rtd_theme
    - h5py
    - dateutil
-    - pyqt5
+    - pyqt
    - quamash
    - pyqtgraph
    - pygit2
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@ -28,7 +28,7 @@ requirements:
    - asyncserial
    - h5py
    - dateutil
-    - pyqt5
+    - pyqt
    - quamash
    - pyqtgraph
    - pygit2