From f08eb1b93fde2e324054c3a5a30711b537977376 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Thu, 9 Feb 2023 07:13:34 +0100 Subject: [PATCH 1/3] upgrade mypy to 1.0.0 --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1de0c15f1..bf4168eaf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -mypy==0.991 -ipython==8.9.0 \ No newline at end of file +mypy~=1.0.0 +ipython~=8.9.0 \ No newline at end of file From aed1e2b058605a1151f7c7644ef9693bdc6d2e6c Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Thu, 9 Feb 2023 07:18:43 +0100 Subject: [PATCH 2/3] itest update imports to official api --- qcodes_contrib_drivers/drivers/Bilt/ITest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qcodes_contrib_drivers/drivers/Bilt/ITest.py b/qcodes_contrib_drivers/drivers/Bilt/ITest.py index 49c1b258e..b6fbf6303 100644 --- a/qcodes_contrib_drivers/drivers/Bilt/ITest.py +++ b/qcodes_contrib_drivers/drivers/Bilt/ITest.py @@ -7,12 +7,12 @@ from math import ceil from time import sleep -from qcodes.instrument.base import Instrument -from qcodes.instrument.channel import InstrumentChannel, ChannelList -from qcodes.instrument.channel import MultiChannelInstrumentParameter -from qcodes.instrument.visa import VisaInstrument +from qcodes.instrument import Instrument +from qcodes.instrument import InstrumentChannel, ChannelList +from qcodes.parameters import MultiChannelInstrumentParameter +from qcodes.instrument import VisaInstrument from qcodes.utils import validators as vals -from qcodes.utils.helpers import create_on_off_val_mapping +from qcodes.parameters import create_on_off_val_mapping class iTestChannel(InstrumentChannel): """ From 844fe1d658de881a84366ee890db14bcd132781d Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Thu, 9 Feb 2023 07:19:04 +0100 Subject: [PATCH 3/3] use the correct variable in str format --- qcodes_contrib_drivers/drivers/Bilt/ITest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcodes_contrib_drivers/drivers/Bilt/ITest.py b/qcodes_contrib_drivers/drivers/Bilt/ITest.py index b6fbf6303..c2b0753f3 100644 --- a/qcodes_contrib_drivers/drivers/Bilt/ITest.py +++ b/qcodes_contrib_drivers/drivers/Bilt/ITest.py @@ -315,7 +315,7 @@ def _set_output_function(self, chan:int, elif outf=='ramp': mode = '1' else: - raise ValueError('Got unexpected output function mode: {}.'.format(mode)) + raise ValueError(f'Got unexpected output function mode: {outf}.') self.write(chan_id + 'trig:input ' + mode)