Merge pull request #109 from dihm/break_runmanager_dep

Break dependency on runmanager by using `labscript_utils.shot_utils.get_shot_globals`
labscript-suite · Oct 12, 2023 · 4674e8b · 4674e8b
2 parents 91b87a9 + f926975
commit 4674e8b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/lyse/dataframe_utilities.py b/lyse/dataframe_utilities.py
@@ -16,7 +16,7 @@
 import labscript_utils.shared_drive
 from labscript_utils.connections import _ensure_str
 from labscript_utils.properties import get_attributes
-import runmanager
+from labscript_utils.shot_utils import get_shot_globals
 
 
 def asdatetime(timestr):
@@ -26,7 +26,7 @@ def asdatetime(timestr):
     return pandas.Timestamp(timestr, tz=tz)
 
 def get_nested_dict_from_shot(filepath):
-    row = runmanager.get_shot_globals(filepath)
+    row = get_shot_globals(filepath)
     with h5py.File(filepath,'r') as h5_file:
         if 'results' in h5_file:
             for groupname in h5_file['results']:

diff --git a/readthedocs.yaml b/readthedocs.yaml
@@ -23,5 +23,4 @@ python:
         path: .
         extra_requirements:
             - docs
-   system_packages: true
 
diff --git a/setup.cfg b/setup.cfg
@@ -31,12 +31,11 @@ install_requires =
   desktop-app>=0.1.2
   h5py
   importlib_metadata
-  labscript_utils>=3.0.0
+  labscript_utils>=3.3.0
   matplotlib
   numpy
   pandas>=0.21
   qtutils>=2.2.2
-  runmanager>=3.0.0
   scipy
   tzlocal
   zprocess>=2.2.2
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,5 +23,4 @@ python: @@
             path: .
             extra_requirements:
                 - docs
-       system_packages: true