From 5171f65fb396da60bc4e4c2a22da25b2affe8938 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 12 Oct 2023 16:25:59 -0400 Subject: [PATCH 1/2] Fix RTD builds --- readthedocs.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/readthedocs.yaml b/readthedocs.yaml index 35084d6e..12f19ff1 100644 --- a/readthedocs.yaml +++ b/readthedocs.yaml @@ -23,5 +23,4 @@ python: path: . extra_requirements: - docs - system_packages: true \ No newline at end of file From 33871e1c27522d6897b9cf867739d73491b49739 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 12 Oct 2023 16:26:41 -0400 Subject: [PATCH 2/2] Change `runmanager.get_shot_globals` to `labscript_utils.shot_utils.get_shot_globals` --- labscript_devices/FunctionRunner/blacs_workers.py | 4 ++-- setup.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/labscript_devices/FunctionRunner/blacs_workers.py b/labscript_devices/FunctionRunner/blacs_workers.py index d4f7d143..543671c3 100644 --- a/labscript_devices/FunctionRunner/blacs_workers.py +++ b/labscript_devices/FunctionRunner/blacs_workers.py @@ -14,9 +14,9 @@ from time import monotonic import numpy as np import labscript_utils.h5_lock +from labscript_utils.shot_utils import get_shot_globals import h5py from blacs.tab_base_classes import Worker -import runmanager import runmanager.remote from zprocess import rich_print from .utils import deserialise_function @@ -48,7 +48,7 @@ class ShotContext(object): def __init__(self, h5_file, device_name): self.h5_file = h5_file self.device_name = device_name - self.globals = runmanager.get_shot_globals(h5_file) + self.globals = get_shot_globals(h5_file) class FunctionRunnerWorker(Worker): diff --git a/setup.cfg b/setup.cfg index 980690fe..25f2264f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,7 @@ install_requires = runmanager>=3.0.0 importlib_metadata labscript>=3.0.0 - labscript_utils>=3.0.0 + labscript_utils>=3.3.0 numpy>=1.15.1 pillow tqdm