From d873c25b8baa8fe2e10d3226028fa3cc3fc195db Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 8 Feb 2016 19:32:40 +0100 Subject: [PATCH] Use Qt5 --- artiq/frontend/artiq_gui.py | 6 ++++-- conda/artiq/meta.yaml | 1 + setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py index 06de89683..eb1e9cbb7 100755 --- a/artiq/frontend/artiq_gui.py +++ b/artiq/frontend/artiq_gui.py @@ -5,11 +5,13 @@ import asyncio 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 index 28b474860..c0ebf8442 100644 --- 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 index 1f5c651bd..e40670709 100755 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ if sys.version_info[:3] < (3, 5, 1): 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",