Use Qt5

m-labs · Feb 8, 2016 · d873c25 · d873c25
1 parent dc955d4
commit d873c25
Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py
@@ -5,11 +5,13 @@
 import atexit
 import os
 
-# Quamash must be imported first so that pyqtgraph picks up the Qt binding
-# it has chosen.
+import PyQt5
 from quamash import QEventLoop, QtGui, QtCore
+assert QtGui is PyQt5.QtGui
+# pyqtgraph will pick up any already imported Qt binding.
 from pyqtgraph import dockarea
 
+
 from artiq import __artiq_dir__ as artiq_dir
 from artiq.tools import *
 from artiq.protocols.pc_rpc import AsyncioClient, Server

diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
@@ -46,6 +46,7 @@ requirements:
     - sphinx-argparse
     - h5py
     - dateutil
+    - pyqt 5.*
     - quamash
     - pyqtgraph
     - pygit2

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 
 requirements = [
     "sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
-    "python-dateutil", "prettytable", "h5py",
+    "python-dateutil", "prettytable", "h5py", "pyqt5",
     "quamash", "pyqtgraph", "pygit2", "aiohttp",
     "llvmlite_artiq", "pythonparser", "python-Levenshtein",
     "lit", "OutputCheck",