Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions labscript_devices/FunctionRunner/blacs_workers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):
Expand Down
1 change: 0 additions & 1 deletion readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ python:
path: .
extra_requirements:
- docs
system_packages: true

2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down