forked from M-Labs/artiq
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:
commit
fca315235c
@ -36,7 +36,7 @@ requirements:
|
||||
- sphinx_rtd_theme
|
||||
- h5py
|
||||
- dateutil
|
||||
- pyqt5
|
||||
- pyqt
|
||||
- quamash
|
||||
- pyqtgraph
|
||||
- pygit2
|
||||
|
@ -28,7 +28,7 @@ requirements:
|
||||
- asyncserial
|
||||
- h5py
|
||||
- dateutil
|
||||
- pyqt5
|
||||
- pyqt
|
||||
- quamash
|
||||
- pyqtgraph
|
||||
- pygit2
|
||||
|
Loading…
Reference in New Issue
Block a user