This commit is contained in:
Sebastien Bourdeauducq 2016-02-08 19:32:40 +01:00
parent dc955d46c9
commit d873c25b8b
3 changed files with 6 additions and 3 deletions

View File

@ -5,11 +5,13 @@ import asyncio
import atexit import atexit
import os import os
# Quamash must be imported first so that pyqtgraph picks up the Qt binding import PyQt5
# it has chosen.
from quamash import QEventLoop, QtGui, QtCore 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 pyqtgraph import dockarea
from artiq import __artiq_dir__ as artiq_dir from artiq import __artiq_dir__ as artiq_dir
from artiq.tools import * from artiq.tools import *
from artiq.protocols.pc_rpc import AsyncioClient, Server from artiq.protocols.pc_rpc import AsyncioClient, Server

View File

@ -46,6 +46,7 @@ requirements:
- sphinx-argparse - sphinx-argparse
- h5py - h5py
- dateutil - dateutil
- pyqt 5.*
- quamash - quamash
- pyqtgraph - pyqtgraph
- pygit2 - pygit2

View File

@ -12,7 +12,7 @@ if sys.version_info[:3] < (3, 5, 1):
requirements = [ requirements = [
"sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy", "sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
"python-dateutil", "prettytable", "h5py", "python-dateutil", "prettytable", "h5py", "pyqt5",
"quamash", "pyqtgraph", "pygit2", "aiohttp", "quamash", "pyqtgraph", "pygit2", "aiohttp",
"llvmlite_artiq", "pythonparser", "python-Levenshtein", "llvmlite_artiq", "pythonparser", "python-Levenshtein",
"lit", "OutputCheck", "lit", "OutputCheck",