Skip to content

Commit 24f2d6a

Browse files
authored
Merge pull request #111 from dihm/runmanager_dep_break
Remove latent dependency on runmanager due to `get_shot_globals`.
2 parents 37be1bf + 554968f commit 24f2d6a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

labscript/labscript.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,8 @@ def stop(t, target_cycle_time=None, cycle_time_delay_after_programming=False):
706706
# TO_DELETE:runmanager-batchompiler-agnostic
707707
# entire function load_globals can be deleted
708708
def load_globals(hdf5_filename):
709-
import runmanager
710-
params = runmanager.get_shot_globals(hdf5_filename)
709+
import labscript_utils.shot_utils
710+
params = labscript_utils.shot_utils.get_shot_globals(hdf5_filename)
711711
with h5py.File(hdf5_filename,'r') as hdf5_file:
712712
for name in params.keys():
713713
if name in globals() or name in locals() or name in _builtins_dict:

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ packages = find:
2929
python_requires = >=3.6
3030
install_requires =
3131
importlib_metadata
32-
labscript_utils>=3.0.0
32+
labscript_utils>=3.3.0
3333
numpy>=1.15
3434
scipy
3535
matplotlib

0 commit comments

Comments
 (0)