Update usage of deprecated driverS

Author: jenshnielsen

src/qcodes/instrument_drivers/ithaco/Ithaco_1211.py

@@ -62,7 +62,7 @@ def __init__(
         self.units = (p_unit, "A")
 
     def get_raw(self) -> tuple[ParamRawDataType, ...]:
-        assert isinstance(self.instrument, Ithaco_1211)
+        assert isinstance(self.instrument, Ithaco1211)
         volt = self._measured_param.get()
         current = (
             self.instrument.sens.get() * self.instrument.sens_factor.get()

src/qcodes/instrument_drivers/yokogawa/GS200.py

@@ -73,7 +73,7 @@ class GS200_Monitor(InstrumentChannel):
 
     def __init__(
         self,
-        parent: "GS200",
+        parent: "GS200",  # pyright: ignore[reportDeprecated]
         name: str,
         present: bool,
         **kwargs: "Unpack[InstrumentBaseKWArgs]",
@@ -184,19 +184,19 @@ def state(self) -> int:
 
     def _get_measurement(self) -> float:
         if self._unit is None or self._range is None:
-            raise GS200Exception("Measurement module not initialized.")
+            raise GS200Exception("Measurement module not initialized.")  # pyright: ignore[reportDeprecated]
         if self._parent.auto_range.get() or (self._unit == "VOLT" and self._range < 1):
             # Measurements will not work with autorange, or when
             # range is <1V.
             self._enabled = False
-            raise GS200Exception(
+            raise GS200Exception(  # pyright: ignore[reportDeprecated]
                 "Measurements will not work when range is <1V"
                 "or when in auto range mode."
             )
         if not self._output:
-            raise GS200Exception("Output is off.")
+            raise GS200Exception("Output is off.")  # pyright: ignore[reportDeprecated]
         if not self._enabled:
-            raise GS200Exception("Measurements are disabled.")
+            raise GS200Exception("Measurements are disabled.")  # pyright: ignore[reportDeprecated]
         # If enabled and output is on, then we can perform a measurement.
         return float(self.ask(":MEAS?"))
 
@@ -236,7 +236,7 @@ class GS200Program(InstrumentChannel):
 
     def __init__(
         self,
-        parent: "GS200",
+        parent: "GS200",  # pyright: ignore[reportDeprecated]
         name: str,
         **kwargs: "Unpack[InstrumentBaseKWArgs]",
     ) -> None:
@@ -504,16 +504,18 @@ def __init__(
 
         # Check if monitor is present, and if so enable measurement
         monitor_present = "/MON" in self.ask("*OPT?")
-        self.measure: GS200_Monitor = self.add_submodule(
-            "measure", GS200_Monitor(self, "measure", monitor_present)
+        self.measure: GS200_Monitor = self.add_submodule(  # pyright: ignore[reportDeprecated]
+            "measure",
+            GS200_Monitor(self, "measure", monitor_present),  # pyright: ignore[reportDeprecated]
         )
         """Instrument module measure"""
 
         # Reset function
         self.add_function("reset", call_cmd="*RST")
 
-        self.program: GS200Program = self.add_submodule(
-            "program", GS200Program(self, "program")
+        self.program: GS200Program = self.add_submodule(  # pyright: ignore[reportDeprecated]
+            "program",
+            GS200Program(self, "program"),  # pyright: ignore[reportDeprecated]
         )
         """Instrument module program"""
 
@@ -744,7 +746,7 @@ def _set_source_mode(self, mode: ModeType) -> None:
 
         """
         if self.output() == "on":
-            raise GS200Exception("Cannot switch mode while source is on")
+            raise GS200Exception("Cannot switch mode while source is on")  # pyright: ignore[reportDeprecated]
 
         if mode == "VOLT":
             self.range.source = self.voltage_range

tests/drivers/test_Keysight_N6705B.py

@@ -1,11 +1,11 @@
 import pytest
 
-import qcodes.instrument_drivers.Keysight.Keysight_N6705B as N6705B
+import qcodes.instrument_drivers.Keysight.Keysight_N6705B as N6705B_module
 
 
 @pytest.fixture(scope="function", name="driver")
 def _make_driver():
-    driver = N6705B.N6705B(
+    driver = N6705B_module.KeysightN6705B(
         "N6705B", address="GPIB::1::INSTR", pyvisa_sim_file="Keysight_N6705B.yaml"
     )
     yield driver

tests/drivers/test_MercuryiPS.py

@@ -6,13 +6,13 @@
 from hypothesis import HealthCheck, given, settings
 from pytest import LogCaptureFixture
 
-from qcodes.instrument_drivers.oxford.MercuryiPS_VISA import MercuryiPS
+from qcodes.instrument_drivers.oxford.MercuryiPS_VISA import OxfordMercuryiPS
 from qcodes.math_utils.field_vector import FieldVector
 
 
 @pytest.fixture(scope="function")
 def driver():
-    mips = MercuryiPS(
+    mips = OxfordMercuryiPS(
         "mips", address="GPIB::1::INSTR", pyvisa_sim_file="MercuryiPS.yaml"
     )
     yield mips
@@ -27,7 +27,7 @@ def spherical_limits(x, y, z):
         """
         return np.sqrt(x**2 + y**2 + z**2) <= 2
 
-    mips_sl = MercuryiPS(
+    mips_sl = OxfordMercuryiPS(
         "mips_sl",
         address="GPIB::1::INSTR",
         pyvisa_sim_file="MercuryiPS.yaml",
@@ -49,7 +49,7 @@ def cylindrical_limits(x, y, z):
 
         return rho_check and z_check
 
-    mips_cl = MercuryiPS(
+    mips_cl = OxfordMercuryiPS(
         "mips_cl",
         address="GPIB::1::INSTR",
         pyvisa_sim_file="MercuryiPS.yaml",
@@ -88,7 +88,7 @@ def test_vector_ramp_rate(driver) -> None:
 def test_wrong_field_limit_raises() -> None:
     # check that a non-callable input fails
     with pytest.raises(ValueError):
-        MercuryiPS(
+        OxfordMercuryiPS(
             "mips",
             address="GPIB::1::INSTR",
             pyvisa_sim_file="MercuryiPS.yaml",

tests/drivers/test_RS_SGS100A.py

@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 
-from qcodes.instrument_drivers.rohde_schwarz.SGS100A import RohdeSchwarz_SGS100A
+from qcodes.instrument_drivers.rohde_schwarz.SGS100A import RohdeSchwarzSGS100A
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -14,7 +14,7 @@ def _make_sg():
     """
     Create a RohdeSchwarz SGS100A instrument
     """
-    driver = RohdeSchwarz_SGS100A(
+    driver = RohdeSchwarzSGS100A(
         "sgs100a", address="GPIB::1::INSTR", pyvisa_sim_file="RSSGS100A.yaml"
     )
     yield driver

tests/drivers/test_keithley_3706A.py

@@ -2,12 +2,12 @@
 
 import pytest
 
-from qcodes.instrument_drivers.tektronix.Keithley_3706A import Keithley_3706A
+from qcodes.instrument_drivers.Keithley.Keithley_3706A import Keithley3706A
 
 
 @pytest.fixture(scope="function", name="driver")
 def _make_driver():
-    driver = Keithley_3706A(
+    driver = Keithley3706A(
         "Keithley_3706A",
         address="GPIB::11::INSTR",
         pyvisa_sim_file="Keithley_3706A.yaml",

tests/drivers/test_keithley_s46.py

@@ -3,7 +3,10 @@
 import pytest
 from pytest import FixtureRequest, LogCaptureFixture
 
-from qcodes.instrument_drivers.tektronix.Keithley_s46 import S46, LockAcquisitionError
+from qcodes.instrument_drivers.Keithley.Keithley_s46 import (
+    KeithleyS46,
+    KeithleyS46LockAcquisitionError,
+)
 
 
 def test_aliases_dict() -> None:
@@ -19,15 +22,17 @@ def calc_channel_nr(alias: str) -> int:
         offset_dict = dict(zip(["A", "B", "C", "D", "R"], range(0, 32, 6)))
         return offset_dict[alias[0]] + int(alias[1:])
 
-    assert all([nr == calc_channel_nr(al) for al, nr in S46.channel_numbers.items()])
+    assert all(
+        [nr == calc_channel_nr(al) for al, nr in KeithleyS46.channel_numbers.items()]
+    )
 
 
 @pytest.fixture(scope="function")
 def s46_six():
     """
     A six channel-per-relay instrument
     """
-    driver = S46(
+    driver = KeithleyS46(
         "s46_six", address="GPIB::2::INSTR", pyvisa_sim_file="Keithley_s46.yaml"
     )
 
@@ -42,7 +47,7 @@ def s46_four():
     """
     A four channel-per-relay instrument
     """
-    driver = S46(
+    driver = KeithleyS46(
         "s46_four", address="GPIB::3::INSTR", pyvisa_sim_file="Keithley_s46.yaml"
     )
 
@@ -58,13 +63,13 @@ def test_runtime_error_on_bad_init(request: FixtureRequest) -> None:
     channel per relay closed, raise a runtime error. An instrument can come to
     this state if previously, other software was used to control the instrument
     """
-    request.addfinalizer(S46.close_all)
+    request.addfinalizer(KeithleyS46.close_all)
 
     with pytest.raises(
         RuntimeError,
         match="The driver is initialized from an undesirable instrument state",
     ):
-        S46(
+        KeithleyS46(
             "s46_bad_state",
             address="GPIB::1::INSTR",
             pyvisa_sim_file="Keithley_s46.yaml",
@@ -76,7 +81,7 @@ def test_query_close_once_at_init(caplog: LogCaptureFixture) -> None:
     Test that, during initialisation, we query the closed channels only once
     """
     with caplog.at_level(logging.DEBUG):
-        inst = S46(
+        inst = KeithleyS46(
             "s46_test_query_once",
             address="GPIB::2::INSTR",
             pyvisa_sim_file="Keithley_s46.yaml",
@@ -85,14 +90,16 @@ def test_query_close_once_at_init(caplog: LogCaptureFixture) -> None:
         inst.close()
 
 
-def test_init_six(s46_six: S46, caplog: LogCaptureFixture) -> None:
+def test_init_six(s46_six: KeithleyS46, caplog: LogCaptureFixture) -> None:
     """
     Test that the six channel instrument initializes correctly.
     """
     assert len(s46_six.available_channels) == 26
 
     closed_channel_numbers = [1, 8, 13]
-    assert s46_six.closed_channels() == [S46.aliases[i] for i in closed_channel_numbers]
+    assert s46_six.closed_channels() == [
+        KeithleyS46.aliases[i] for i in closed_channel_numbers
+    ]
 
     with caplog.at_level(logging.DEBUG):
         s46_six.open_all_channels()
@@ -105,15 +112,15 @@ def test_init_six(s46_six: S46, caplog: LogCaptureFixture) -> None:
         assert s46_six.C1._lock._locked_by is None
 
 
-def test_init_four(s46_four: S46) -> None:
+def test_init_four(s46_four: KeithleyS46) -> None:
     """
     Test that the six channel instrument initializes correctly.
     """
     assert len(s46_four.available_channels) == 18
 
     closed_channel_numbers = [1, 8]
     assert s46_four.closed_channels() == [
-        S46.aliases[i] for i in closed_channel_numbers
+        KeithleyS46.aliases[i] for i in closed_channel_numbers
     ]
 
     # A four channel instrument will have channels missing
@@ -123,28 +130,30 @@ def test_init_four(s46_four: S46) -> None:
             assert not hasattr(s46_four, alias)
 
 
-def test_channel_number_invariance(s46_four: S46, s46_six: S46) -> None:
+def test_channel_number_invariance(s46_four: KeithleyS46, s46_six: KeithleyS46) -> None:
     """
     Regardless of the channel layout (that is, number of channels per relay),
     channel aliases should represent the same channel. See also page 2-5 of the
     manual (e.g. B1 is *always* channel 7)
     """
-    for alias in S46.channel_numbers.keys():
+    for alias in KeithleyS46.channel_numbers.keys():
         if hasattr(s46_four, alias) and hasattr(s46_six, alias):
             channel_four = getattr(s46_four, alias)
             channel_six = getattr(s46_six, alias)
             assert channel_four.channel_number == channel_six.channel_number
 
 
-def test_locking_mechanism(s46_six: S46) -> None:
+def test_locking_mechanism(s46_six: KeithleyS46) -> None:
     """
     1) Test that the lock acquisition error is raised if we try to close
     more then once channel per replay
     2) Test that the lock is released when opening a channel that was closed
     """
     s46_six.A1("close")
 
-    with pytest.raises(LockAcquisitionError, match="is already in use by channel"):
+    with pytest.raises(
+        KeithleyS46LockAcquisitionError, match="is already in use by channel"
+    ):
         # A1 should be closed already
         s46_six.A2("close")
     # release the lock
@@ -155,15 +164,17 @@ def test_locking_mechanism(s46_six: S46) -> None:
     # Let C1 acquire the lock
     s46_six.C1("close")
     # closing C2 should raise an error
-    with pytest.raises(LockAcquisitionError, match="is already in use by channel"):
+    with pytest.raises(
+        KeithleyS46LockAcquisitionError, match="is already in use by channel"
+    ):
         s46_six.C2("close")
 
     # Upon opening C1 we should be able to close C2
     s46_six.C1("open")
     s46_six.C2("close")
 
 
-def test_is_closed(s46_six: S46) -> None:
+def test_is_closed(s46_six: KeithleyS46) -> None:
     """
     Test the `is_closed` public method
     """

tests/drivers/test_keysight_n9030b.py

@@ -1,15 +1,15 @@
 import pytest
 
-from qcodes.instrument_drivers.Keysight.N9030B import (
-    N9030B,
-    PhaseNoiseMode,
-    SpectrumAnalyzerMode,
+from qcodes.instrument_drivers.Keysight.Keysight_N9030B import (
+    KeysightN9030B,
+    KeysightN9030BPhaseNoiseMode,
+    KeysightN9030BSpectrumAnalyzerMode,
 )
 
 
 @pytest.fixture(name="driver")
 def _make_driver():
-    driver = N9030B(
+    driver = KeysightN9030B(
         "n9030B_sim", address="GPIB::1::INSTR", pyvisa_sim_file="Keysight_N9030B.yaml"
     )
     yield driver
@@ -36,7 +36,7 @@ def test_idn(driver) -> None:
 
 
 def test_swept_sa_setup(sa) -> None:
-    assert isinstance(sa, SpectrumAnalyzerMode)
+    assert isinstance(sa, KeysightN9030BSpectrumAnalyzerMode)
 
     sa.setup_swept_sa_sweep(123, 11e3, 501)
     assert sa.root_instrument.mode() == "SA"
@@ -48,7 +48,7 @@ def test_swept_sa_setup(sa) -> None:
 
 
 def test_log_plot_setup(pn) -> None:
-    assert isinstance(pn, PhaseNoiseMode)
+    assert isinstance(pn, KeysightN9030BPhaseNoiseMode)
 
     pn.setup_log_plot_sweep(1000, 1e7, 10001)
     assert pn.root_instrument.mode() == "PNOISE"

tests/drivers/test_tektronix_AWG5208.py

@@ -2,12 +2,12 @@
 
 import pytest
 
-from qcodes.instrument_drivers.tektronix.AWG5208 import AWG5208
+from qcodes.instrument_drivers.tektronix.AWG5208 import TektronixAWG5208
 
 
 @pytest.fixture(scope="function")
 def awg():
-    awg_sim = AWG5208(
+    awg_sim = TektronixAWG5208(
         "awg_sim", address="GPIB0::1::INSTR", pyvisa_sim_file="Tektronix_AWG5208.yaml"
     )
     yield awg_sim

tests/mockers/test_simulated_ats_api.py

@@ -5,7 +5,7 @@
 
 from qcodes.instrument.mockers.simulated_ats_api import SimulatedATS9360API
 from qcodes.instrument_drivers.AlazarTech.ATS import AcquisitionInterface
-from qcodes.instrument_drivers.AlazarTech.ATS9360 import AlazarTech_ATS9360 as ATS9360
+from qcodes.instrument_drivers.AlazarTech.ATS9360 import AlazarTechATS9360 as ATS9360
 
 
 def ones_generator(data):