Merge pull request #49 from philipstarkey/break-circular-dependency

Updated runviewer to use the new labscript-utils device registry.

Author: dihm

runviewer/__main__.py

@@ -64,7 +64,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
@@ -1536,8 +1536,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)
 

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