srenblad/artiq
1
0
Fork 0
forked from M-Labs/artiq
Code Pull Requests Activity

gui: quamash -> qasync

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2020-12-12 21:50:11 +08:00
parent 1ce505c547
commit 4b10273a2d
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES.rst
View File

@ -54,6 +54,7 @@ Breaking changes:
thin veneer around lists. Most prior use cases of NumPy arrays in kernels should work thin veneer around lists. Most prior use cases of NumPy arrays in kernels should work
unchanged with the new implementation, but the behavior might differ slightly in some unchanged with the new implementation, but the behavior might differ slightly in some
cases (for instance, non-rectangular arrays are not currently supported). cases (for instance, non-rectangular arrays are not currently supported).
* ``quamash`` has been replaced with ``qasync``.
ARTIQ-5 ARTIQ-5

6
artiq/applets/simple.py
View File

@ -4,7 +4,7 @@ import asyncio
import os import os
import string import string
from quamash import QEventLoop, QtWidgets, QtCore from qasync import QEventLoop, QtWidgets, QtCore
from sipyco.sync_struct import Subscriber, process_mod from sipyco.sync_struct import Subscriber, process_mod
from sipyco import pyon from sipyco import pyon
@ -114,7 +114,7 @@ class SimpleApplet:
self.datasets = {getattr(self.args, arg.replace("-", "_")) self.datasets = {getattr(self.args, arg.replace("-", "_"))
for arg in self.dataset_args} for arg in self.dataset_args}
def quamash_init(self): def qasync_init(self):
app = QtWidgets.QApplication([]) app = QtWidgets.QApplication([])
self.loop = QEventLoop(app) self.loop = QEventLoop(app)
asyncio.set_event_loop(self.loop) asyncio.set_event_loop(self.loop)
@ -212,7 +212,7 @@ class SimpleApplet:
def run(self): def run(self):
self.args_init() self.args_init()
self.quamash_init() self.qasync_init()
try: try:
self.ipc_init() self.ipc_init()
try: try:

5
artiq/frontend/artiq_browser.py
View File

@ -8,7 +8,7 @@ import logging
import sys import sys
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from quamash import QEventLoop from qasync import QEventLoop
from sipyco.asyncio_tools import atexit_register_coroutine from sipyco.asyncio_tools import atexit_register_coroutine
from sipyco import common_args from sipyco import common_args
@ -144,9 +144,6 @@ def main():
app = QtWidgets.QApplication(["ARTIQ Browser"]) app = QtWidgets.QApplication(["ARTIQ Browser"])
loop = QEventLoop(app) loop = QEventLoop(app)
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
# https://github.com/harvimt/quamash/issues/123
if sys.version_info >= (3, 8):
asyncio.events._set_running_loop(loop)
atexit.register(loop.close) atexit.register(loop.close)
datasets_sub = models.LocalModelManager(datasets.Model) datasets_sub = models.LocalModelManager(datasets.Model)

5
artiq/frontend/artiq_dashboard.py
View File

@ -8,7 +8,7 @@ import logging
import sys import sys
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from quamash import QEventLoop from qasync import QEventLoop
from sipyco.pc_rpc import AsyncioClient, Client from sipyco.pc_rpc import AsyncioClient, Client
from sipyco.broadcast import Receiver from sipyco.broadcast import Receiver
@ -104,9 +104,6 @@ def main():
app = QtWidgets.QApplication(["ARTIQ Dashboard"]) app = QtWidgets.QApplication(["ARTIQ Dashboard"])
loop = QEventLoop(app) loop = QEventLoop(app)
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
# https://github.com/harvimt/quamash/issues/123
if sys.version_info >= (3, 8):
asyncio.events._set_running_loop(loop)
atexit.register(loop.close) atexit.register(loop.close)
smgr = state.StateManager(args.db_file) smgr = state.StateManager(args.db_file)

2
doc/manual/conf.py
View File

@ -36,7 +36,7 @@ mock_modules = ["artiq.gui.waitingspinnerwidget",
"artiq.compiler.module", "artiq.compiler.module",
"artiq.compiler.embedding", "artiq.compiler.embedding",
"artiq.dashboard", "artiq.dashboard",
"quamash", "pyqtgraph", "matplotlib", "qasync", "pyqtgraph", "matplotlib",
"numpy", "dateutil", "dateutil.parser", "prettytable", "PyQt5", "numpy", "dateutil", "dateutil.parser", "prettytable", "PyQt5",
"h5py", "serial", "scipy", "scipy.interpolate", "h5py", "serial", "scipy", "scipy.interpolate",
"llvmlite_artiq", "Levenshtein", "pythonparser", "llvmlite_artiq", "Levenshtein", "pythonparser",

2
setup.py
View File

@ -14,7 +14,7 @@ if sys.version_info[:3] < (3, 5, 3):
requirements = [ requirements = [
"numpy", "scipy", "numpy", "scipy",
"python-dateutil", "prettytable", "h5py", "python-dateutil", "prettytable", "h5py",
"quamash", "pyqtgraph", "pygit2", "qasync", "pyqtgraph", "pygit2",
"llvmlite_artiq", "pythonparser", "python-Levenshtein", "llvmlite_artiq", "pythonparser", "python-Levenshtein",
] ]