From 741d790a5586e20a1a3ed81ab8b03f9ab6802295 Mon Sep 17 00:00:00 2001 From: philipstarkey Date: Thu, 16 Jul 2020 17:17:02 +1000 Subject: [PATCH] Updated BLACS 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) --- blacs/__main__.py | 4 ++-- setup.cfg | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/blacs/__main__.py b/blacs/__main__.py index 35668dcb..002454b9 100644 --- a/blacs/__main__.py +++ b/blacs/__main__.py @@ -95,7 +95,7 @@ # Queue Manager Code from blacs.experiment_queue import QueueManager, QueueTreeview # Module containing hardware compatibility: -import labscript_devices +from labscript_utils import device_registry # Save/restore frontpanel code from blacs.front_panel_settings import FrontPanelSettings # Notifications system @@ -266,7 +266,7 @@ def __init__(self,application): self.settings_dict[device_name]["saved_data"] = tab_data[device_name]['data'] if device_name in tab_data else {} # Instantiate the device logger.info('instantiating %s'%device_name) - TabClass = labscript_devices.get_BLACS_tab(labscript_device_class_name) + TabClass = device_registry.get_BLACS_tab(labscript_device_class_name) self.tablist[device_name] = TabClass(self.tab_widgets[0],self.settings_dict[device_name]) except Exception: self.failed_device_settings[device_name] = {"front_panel": self.settings_dict[device_name]["front_panel_settings"], "save_data": self.settings_dict[device_name]["saved_data"]} diff --git a/setup.cfg b/setup.cfg index 815d189f..5b8f2a98 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,8 +26,7 @@ packages = find: python_requires = >=3.6 install_requires = importlib_metadata - labscript_devices>=3.0.0 - labscript_utils>=3.0.0 + labscript_utils>=3.1.0b1 qtutils>=2.3.2 zprocess>=2.14.1