Skip to content

Commit 4674e8b

Browse files
authored
Merge pull request #109 from dihm/break_runmanager_dep
Break dependency on runmanager by using `labscript_utils.shot_utils.get_shot_globals`
2 parents 91b87a9 + f926975 commit 4674e8b

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

lyse/dataframe_utilities.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import labscript_utils.shared_drive
1717
from labscript_utils.connections import _ensure_str
1818
from labscript_utils.properties import get_attributes
19-
import runmanager
19+
from labscript_utils.shot_utils import get_shot_globals
2020

2121

2222
def asdatetime(timestr):
@@ -26,7 +26,7 @@ def asdatetime(timestr):
2626
return pandas.Timestamp(timestr, tz=tz)
2727

2828
def get_nested_dict_from_shot(filepath):
29-
row = runmanager.get_shot_globals(filepath)
29+
row = get_shot_globals(filepath)
3030
with h5py.File(filepath,'r') as h5_file:
3131
if 'results' in h5_file:
3232
for groupname in h5_file['results']:

readthedocs.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,4 @@ python:
2323
path: .
2424
extra_requirements:
2525
- docs
26-
system_packages: true
2726

setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ install_requires =
3131
desktop-app>=0.1.2
3232
h5py
3333
importlib_metadata
34-
labscript_utils>=3.0.0
34+
labscript_utils>=3.3.0
3535
matplotlib
3636
numpy
3737
pandas>=0.21
3838
qtutils>=2.2.2
39-
runmanager>=3.0.0
4039
scipy
4140
tzlocal
4241
zprocess>=2.2.2

0 commit comments

Comments
 (0)