forked from M-Labs/artiq
Use Qt5
This commit is contained in:
parent
dc955d46c9
commit
d873c25b8b
|
@ -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
|
||||
|
|
|
@ -46,6 +46,7 @@ requirements:
|
|||
- sphinx-argparse
|
||||
- h5py
|
||||
- dateutil
|
||||
- pyqt 5.*
|
||||
- quamash
|
||||
- pyqtgraph
|
||||
- pygit2
|
||||
|
|
2
setup.py
2
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",
|
||||
|
|
Loading…
Reference in New Issue