Skip to content

Commit ca3ab69

Browse files
committed
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)
1 parent fc4e42a commit ca3ab69

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

runviewer/__main__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
import qtutils.icons
6464
splash.update_text('importing labscript suite modules')
6565
from labscript_utils.connections import ConnectionTable
66-
import labscript_devices
66+
from labscript_utils import device_registry
6767

6868
from labscript_utils.labconfig import LabConfig, save_appconfig, load_appconfig
6969
from labscript_utils.ls_zprocess import ZMQServer, ProcessTree
@@ -1521,8 +1521,7 @@ def _load_device(self, device, clock=None):
15211521
print('loading %s' % device.name)
15221522
module = device.device_class
15231523
# Load the master pseudoclock class
1524-
# labscript_devices.import_device(module)
1525-
device_class = labscript_devices.get_runviewer_parser(module)
1524+
device_class = device_registry.get_runviewer_parser(module)
15261525
device_instance = device_class(self.path, device)
15271526
clocklines_and_triggers = device_instance.get_traces(self.add_trace, clock)
15281527

setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ python_requires = >=3.6
2727
install_requires =
2828
desktop-app>=0.1.2
2929
importlib_metadata
30-
labscript_devices>=3.0.0
31-
labscript_utils>=3.0.0
30+
labscript_utils>=3.1.0b1
3231
labscript-c-extensions
3332
pyqtgraph>=0.11.0rc0
3433
qtutils>=2.0.0

0 commit comments

Comments
 (0)