From 8ef0d903cfff58f022014b68bdbdeb987a6f7e7e Mon Sep 17 00:00:00 2001 From: THuckemann Date: Fri, 19 Jan 2024 15:14:57 +0100 Subject: [PATCH 01/20] Fixed import (apparently somewhen an underscore was added in qcodes) --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index 855f2bf7..37cd93f7 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -45,7 +45,7 @@ _register_actions, _register_parameters, _set_write_period, - catch_interrupts, + _catch_interrupts, ) from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement From 16a1442a279d826345ef597e5eb991e5eb680e5f Mon Sep 17 00:00:00 2001 From: THuckemann Date: Fri, 19 Jan 2024 15:15:47 +0100 Subject: [PATCH 02/20] Fixed exception for spectrometer import --- src/qumada/measurement/scripts/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qumada/measurement/scripts/__init__.py b/src/qumada/measurement/scripts/__init__.py index c5e867a3..f2076bf8 100644 --- a/src/qumada/measurement/scripts/__init__.py +++ b/src/qumada/measurement/scripts/__init__.py @@ -38,6 +38,8 @@ # Only relevant if you want to use spectrometer. # Requires access to Bluhm Group GitLab pass +except ImportError: + pass __all__ = [ "Generic_1D_Sweep", From 6b54a7fe7310f14a3a1ed522d86d71ca3bfbadad Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:16:59 +0000 Subject: [PATCH 03/20] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index 37cd93f7..905c552a 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -41,11 +41,11 @@ from qcodes.dataset.descriptions.detect_shapes import detect_shape_of_measurement from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes from qcodes.dataset.dond.do_nd_utils import ( + _catch_interrupts, _handle_plotting, _register_actions, _register_parameters, _set_write_period, - _catch_interrupts, ) from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement From 48c6ee9d4aa17dca32d7c03ff29795a6a36877bd Mon Sep 17 00:00:00 2001 From: THuckemann Date: Fri, 19 Jan 2024 15:23:36 +0100 Subject: [PATCH 04/20] Some more fixes --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index 905c552a..c57f803c 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -181,7 +181,7 @@ def do1d_parallel( # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch - with catch_interrupts() as interrupted, meas.run() as datasaver, param_meas_caller as call_param_meas: # noqa: F841 + with _catch_interrupts() as interrupted, meas.run() as datasaver, param_meas_caller as call_param_meas: # noqa: F841 dataset = datasaver.dataset additional_setpoints_data = process_params_meas(additional_setpoints) @@ -345,7 +345,7 @@ def do1d_parallel_asym( # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch - with catch_interrupts() as interrupted, meas.run() as datasaver, param_meas_caller as call_param_meas: # noqa: F841 + with _catch_interrupts() as interrupted, meas.run() as datasaver, param_meas_caller as call_param_meas: # noqa: F841 dataset = datasaver.dataset additional_setpoints_data = process_params_meas(additional_setpoints) From 32e85f65ac564dfd0c22f397cb0c6d24152b23d5 Mon Sep 17 00:00:00 2001 From: THuckemann Date: Fri, 19 Jan 2024 15:27:15 +0100 Subject: [PATCH 05/20] Adding the underscore actually made both impacted line to long by one character. I hate you, pre-commit! --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index c57f803c..204bb63e 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -345,7 +345,8 @@ def do1d_parallel_asym( # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch - with _catch_interrupts() as interrupted, meas.run() as datasaver, param_meas_caller as call_param_meas: # noqa: F841 + with _catch_interrupts() as interrupted, meas.run() as datasaver, \ + param_meas_caller as call_param_meas: dataset = datasaver.dataset additional_setpoints_data = process_params_meas(additional_setpoints) From fe9d934da6863fb2667041964e1bf2923edd67ea Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:28:23 +0000 Subject: [PATCH 06/20] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index 204bb63e..d6b91512 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -345,8 +345,7 @@ def do1d_parallel_asym( # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch - with _catch_interrupts() as interrupted, meas.run() as datasaver, \ - param_meas_caller as call_param_meas: + with _catch_interrupts() as interrupted, meas.run() as datasaver, param_meas_caller as call_param_meas: dataset = datasaver.dataset additional_setpoints_data = process_params_meas(additional_setpoints) From aadcf357e07e7c098e0845539ec750ce7f368f4c Mon Sep 17 00:00:00 2001 From: THuckemann Date: Fri, 19 Jan 2024 15:40:25 +0100 Subject: [PATCH 07/20] removed unused variables --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index d6b91512..b55b6adb 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -181,8 +181,7 @@ def do1d_parallel( # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch - with _catch_interrupts() as interrupted, meas.run() as datasaver, param_meas_caller as call_param_meas: # noqa: F841 - dataset = datasaver.dataset + with _catch_interrupts() as interrupted, meas.run() as datasaver: additional_setpoints_data = process_params_meas(additional_setpoints) # flush to prevent unflushed print's to visually interrupt tqdm bar @@ -345,7 +344,7 @@ def do1d_parallel_asym( # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch - with _catch_interrupts() as interrupted, meas.run() as datasaver, param_meas_caller as call_param_meas: + with _catch_interrupts() as interrupted, meas.run() as datasaver: dataset = datasaver.dataset additional_setpoints_data = process_params_meas(additional_setpoints) From e9cb7bcab707511d1730b09f30d30c3de493f648 Mon Sep 17 00:00:00 2001 From: THuckemann Date: Fri, 19 Jan 2024 15:43:22 +0100 Subject: [PATCH 08/20] Removing more unused variables --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index b55b6adb..4c8fb62a 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -176,11 +176,11 @@ def do1d_parallel( if use_threads is None: use_threads = config.dataset.use_threads - param_meas_caller = ThreadPoolParamsCaller(*param_meas) if use_threads else SequentialParamsCaller(*param_meas) tracked_setpoints = list() # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch + dataset = datasaver.dataset with _catch_interrupts() as interrupted, meas.run() as datasaver: additional_setpoints_data = process_params_meas(additional_setpoints) @@ -339,7 +339,6 @@ def do1d_parallel_asym( if use_threads is None: use_threads = config.dataset.use_threads - param_meas_caller = ThreadPoolParamsCaller(*param_meas) if use_threads else SequentialParamsCaller(*param_meas) tracked_setpoints = list([] for _ in param_set) # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be From 4f24e35ce579726eed6c3b3f274289e43cef1f48 Mon Sep 17 00:00:00 2001 From: THuckemann Date: Fri, 19 Jan 2024 15:45:24 +0100 Subject: [PATCH 09/20] Fixed wrong identation --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index 4c8fb62a..50681a71 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -180,7 +180,7 @@ def do1d_parallel( # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch - dataset = datasaver.dataset + dataset = datasaver.dataset with _catch_interrupts() as interrupted, meas.run() as datasaver: additional_setpoints_data = process_params_meas(additional_setpoints) From b40f87aedf1f1d0772e62db3c4472544146fccd6 Mon Sep 17 00:00:00 2001 From: THuckemann Date: Fri, 19 Jan 2024 15:47:32 +0100 Subject: [PATCH 10/20] Removed unused imports --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index 50681a71..40097536 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -50,8 +50,8 @@ from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement from qcodes.dataset.threading import ( - SequentialParamsCaller, - ThreadPoolParamsCaller, + #SequentialParamsCaller, + #ThreadPoolParamsCaller, process_params_meas, ) from qcodes.parameters import ParameterBase @@ -180,8 +180,9 @@ def do1d_parallel( # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch - dataset = datasaver.dataset + with _catch_interrupts() as interrupted, meas.run() as datasaver: + dataset = datasaver.dataset additional_setpoints_data = process_params_meas(additional_setpoints) # flush to prevent unflushed print's to visually interrupt tqdm bar From c1a8beada38fcd55f6839a418c0c48a52dd826bb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:47:48 +0000 Subject: [PATCH 11/20] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index 40097536..e35e4d43 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -49,9 +49,7 @@ ) from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement -from qcodes.dataset.threading import ( - #SequentialParamsCaller, - #ThreadPoolParamsCaller, +from qcodes.dataset.threading import ( # SequentialParamsCaller,; ThreadPoolParamsCaller, process_params_meas, ) from qcodes.parameters import ParameterBase @@ -180,7 +178,7 @@ def do1d_parallel( # do1D enforces a simple relationship between measured parameters # and set parameters. For anything more complicated this should be # reimplemented from scratch - + with _catch_interrupts() as interrupted, meas.run() as datasaver: dataset = datasaver.dataset additional_setpoints_data = process_params_meas(additional_setpoints) From 46d45ffd61497bc1bfbda7ada7d078442778ab0c Mon Sep 17 00:00:00 2001 From: THuckemann Date: Tue, 30 Jan 2024 17:16:01 +0100 Subject: [PATCH 12/20] Fixed issue where simultaneous ramping of multiple QDac 1 parameters would not work. --- src/qumada/instrument/mapping/QDevil/qdac.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qumada/instrument/mapping/QDevil/qdac.py b/src/qumada/instrument/mapping/QDevil/qdac.py index 9e90cc2a..62b8117a 100644 --- a/src/qumada/instrument/mapping/QDevil/qdac.py +++ b/src/qumada/instrument/mapping/QDevil/qdac.py @@ -49,7 +49,7 @@ def ramp( raise Exception("Maximum length of rampable parameters is 8.") # check, if all parameters are from the same instrument - instruments = [parameter.root_instrument for parameter in parameters] + instruments = {parameter.root_instrument for parameter in parameters} if len(instruments) > 1: raise Exception("Parameters are from more than one instrument. This would lead to non synchronized ramps.") From 914372c7b7e6cc49aecb9bd0dadd0e5454d5081d Mon Sep 17 00:00:00 2001 From: THuckemann Date: Wed, 7 Feb 2024 12:24:30 +0100 Subject: [PATCH 13/20] Checking whether Unittest issues are related to catch_interrupts import. --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index e35e4d43..68131b4e 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -41,12 +41,16 @@ from qcodes.dataset.descriptions.detect_shapes import detect_shape_of_measurement from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes from qcodes.dataset.dond.do_nd_utils import ( - _catch_interrupts, + # _catch_interrupts, _handle_plotting, _register_actions, _register_parameters, _set_write_period, ) +try: + from qcodes.dataset.dond.do_nd_utils import _catch_interrupts +except ImportError: + from qcodes.dataset.dond.do_nd_utils import catch_interrupts as _catch_interrupts from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement from qcodes.dataset.threading import ( # SequentialParamsCaller,; ThreadPoolParamsCaller, From 186edc8bd720508458e32ba2d4c383ecdbf85264 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 11:25:14 +0000 Subject: [PATCH 14/20] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index 68131b4e..5ea8d657 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -40,17 +40,18 @@ from qcodes.dataset.data_set_protocol import DataSetProtocol from qcodes.dataset.descriptions.detect_shapes import detect_shape_of_measurement from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes -from qcodes.dataset.dond.do_nd_utils import ( - # _catch_interrupts, +from qcodes.dataset.dond.do_nd_utils import ( # _catch_interrupts, _handle_plotting, _register_actions, _register_parameters, _set_write_period, ) + try: from qcodes.dataset.dond.do_nd_utils import _catch_interrupts except ImportError: from qcodes.dataset.dond.do_nd_utils import catch_interrupts as _catch_interrupts + from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement from qcodes.dataset.threading import ( # SequentialParamsCaller,; ThreadPoolParamsCaller, From 49bf255ef622f18d5abc2ab7a10c1c75d92a0842 Mon Sep 17 00:00:00 2001 From: THuckemann <71256422+THuckemann@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:52:32 +0100 Subject: [PATCH 15/20] Downgrading pytest version --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 80e16d9c..8caab313 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install coverage pytest pytest-cases pytest-mock pytest-qt pytest-xvfb + pip install coverage pytest<8.0.0 pytest-cases pytest-mock pytest-qt pytest-xvfb - name: Install package run: python -m pip install -e . - name: Test with pytest From bc09bd19048459c88cc6b206694ce05b6653c77a Mon Sep 17 00:00:00 2001 From: THuckemann <71256422+THuckemann@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:57:23 +0100 Subject: [PATCH 16/20] Last commit didn't work.... --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8caab313..97915937 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install coverage pytest<8.0.0 pytest-cases pytest-mock pytest-qt pytest-xvfb + pip install coverage pytest==7.4.4 pytest-cases pytest-mock pytest-qt pytest-xvfb - name: Install package run: python -m pip install -e . - name: Test with pytest From 8fe08e2f0ae505612e0ddb34a35cd2e46cf08d72 Mon Sep 17 00:00:00 2001 From: THuckemann Date: Wed, 7 Feb 2024 13:02:44 +0100 Subject: [PATCH 17/20] Reversing changes to import --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index 5ea8d657..aa8f54c1 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -40,18 +40,14 @@ from qcodes.dataset.data_set_protocol import DataSetProtocol from qcodes.dataset.descriptions.detect_shapes import detect_shape_of_measurement from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes -from qcodes.dataset.dond.do_nd_utils import ( # _catch_interrupts, +from qcodes.dataset.dond.do_nd_utils import ( + _catch_interrupts, _handle_plotting, _register_actions, _register_parameters, _set_write_period, ) -try: - from qcodes.dataset.dond.do_nd_utils import _catch_interrupts -except ImportError: - from qcodes.dataset.dond.do_nd_utils import catch_interrupts as _catch_interrupts - from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement from qcodes.dataset.threading import ( # SequentialParamsCaller,; ThreadPoolParamsCaller, From d9fde0577b7d44682fe6d0910258602c0ef4fa7b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:03:00 +0000 Subject: [PATCH 18/20] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index aa8f54c1..e35e4d43 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -40,14 +40,13 @@ from qcodes.dataset.data_set_protocol import DataSetProtocol from qcodes.dataset.descriptions.detect_shapes import detect_shape_of_measurement from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes -from qcodes.dataset.dond.do_nd_utils import ( +from qcodes.dataset.dond.do_nd_utils import ( _catch_interrupts, _handle_plotting, _register_actions, _register_parameters, _set_write_period, ) - from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement from qcodes.dataset.threading import ( # SequentialParamsCaller,; ThreadPoolParamsCaller, From d21e1fed928b8c637dbbf04d4adc3f4f2bc13648 Mon Sep 17 00:00:00 2001 From: THuckemann Date: Wed, 7 Feb 2024 13:10:52 +0100 Subject: [PATCH 19/20] Apparently the _catch_interrupts import still causes problems. Adding try except again until we sorted it out. --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index e35e4d43..e239aa5d 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -41,12 +41,16 @@ from qcodes.dataset.descriptions.detect_shapes import detect_shape_of_measurement from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes from qcodes.dataset.dond.do_nd_utils import ( - _catch_interrupts, _handle_plotting, _register_actions, _register_parameters, _set_write_period, ) +try: + from qcodes.dataset.dond.do_nd_utils import _catch_interrupts +except ImportError: + from qcodes.dataset.dond.do_nd_utils import catch_interrupts as _catch_interrupts + from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement from qcodes.dataset.threading import ( # SequentialParamsCaller,; ThreadPoolParamsCaller, From 8b86fe7862e92b933fddf0dc12386b4c1faa3ffa Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:11:07 +0000 Subject: [PATCH 20/20] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/qumada/measurement/doNd_enhanced/doNd_enhanced.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py index e239aa5d..4d72f6d5 100644 --- a/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py +++ b/src/qumada/measurement/doNd_enhanced/doNd_enhanced.py @@ -46,11 +46,12 @@ _register_parameters, _set_write_period, ) + try: from qcodes.dataset.dond.do_nd_utils import _catch_interrupts except ImportError: from qcodes.dataset.dond.do_nd_utils import catch_interrupts as _catch_interrupts - + from qcodes.dataset.experiment_container import Experiment from qcodes.dataset.measurements import Measurement from qcodes.dataset.threading import ( # SequentialParamsCaller,; ThreadPoolParamsCaller,