handle qcodes 0.30 support

toolsforexperiments · Nov 30, 2021 · 057a6b9 · 057a6b9
1 parent 311e527
commit 057a6b9
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/plottr/data/qcodes_dataset.py b/plottr/data/qcodes_dataset.py
@@ -23,7 +23,10 @@
 __license__ = 'MIT'
 
 if TYPE_CHECKING:
-    from qcodes.dataset.data_set import DataSet
+    try:
+        from qcodes.dataset import DataSetProtocol
+    except ImportError:
+        from qcodes.dataset.data_set import DataSet as DataSetProtocol
     from qcodes import ParamSpec
 
 
@@ -68,7 +71,7 @@ class DataSetInfoDict(TypedDict):
 
 
 def get_ds_structure(
-        ds: 'DataSet'
+        ds: 'DataSetProtocol'
 ) -> DataSetStructureDict:
     """
     Return the structure of the dataset, i.e., a dictionary in the form
@@ -258,7 +261,7 @@ class QCodesDSLoader(Node):
     def __init__(self, *arg: Any, **kw: Any):
         self._pathAndId: Tuple[Optional[str], Optional[int]] = (None, None)
         self.nLoadedRecords = 0
-        self._dataset: Optional[DataSet] = None
+        self._dataset: Optional[DataSetProtocol] = None
 
         super().__init__(*arg, **kw)