Merge pull request #203 from jenshnielsen/mypy_1_0_0

upgrade mypy to 1.0.0
QCoDeS · Feb 9, 2023 · 9fb09e9 · 9fb09e9
2 parents 2f18fdc + 844fe1d
commit 9fb09e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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):
     """
@@ -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)
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-mypy==0.991
-ipython==8.9.0
+mypy~=1.0.0
+ipython~=8.9.0