From ca3ab6937bfc3f119545150101fdbf84521b7239 Mon Sep 17 00:00:00 2001 From: philipstarkey Date: Thu, 16 Jul 2020 17:22:52 +1000 Subject: [PATCH] Updated runviewer to use the new labscript-utils device registry. Removes the circular dependency on labscript-devices. This update assumes we will publish a new labscript-utils beta (3.1.0b1) shortly (so will fail to build on RTD until that is done) --- runviewer/__main__.py | 5 ++--- setup.cfg | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/runviewer/__main__.py b/runviewer/__main__.py index 815d9a5..a9e754b 100644 --- a/runviewer/__main__.py +++ b/runviewer/__main__.py @@ -63,7 +63,7 @@ import qtutils.icons splash.update_text('importing labscript suite modules') from labscript_utils.connections import ConnectionTable -import labscript_devices +from labscript_utils import device_registry from labscript_utils.labconfig import LabConfig, save_appconfig, load_appconfig from labscript_utils.ls_zprocess import ZMQServer, ProcessTree @@ -1521,8 +1521,7 @@ def _load_device(self, device, clock=None): print('loading %s' % device.name) module = device.device_class # Load the master pseudoclock class - # labscript_devices.import_device(module) - device_class = labscript_devices.get_runviewer_parser(module) + device_class = device_registry.get_runviewer_parser(module) device_instance = device_class(self.path, device) clocklines_and_triggers = device_instance.get_traces(self.add_trace, clock) diff --git a/setup.cfg b/setup.cfg index 7e2ad63..9c409bd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,8 +27,7 @@ python_requires = >=3.6 install_requires = desktop-app>=0.1.2 importlib_metadata - labscript_devices>=3.0.0 - labscript_utils>=3.0.0 + labscript_utils>=3.1.0b1 labscript-c-extensions pyqtgraph>=0.11.0rc0 qtutils>=2.0.0