Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0c68e2f
Remove deprecated AlazarTech driver aliases
jenshnielsen May 4, 2026
270dcbb
Remove deprecated Basel driver module shims
jenshnielsen May 4, 2026
95ed6ed
Remove deprecated Ithaco driver alias
jenshnielsen May 4, 2026
4ada4f6
Remove deprecated Keithley driver aliases and module shims
jenshnielsen May 4, 2026
fd51291
Remove deprecated HP driver aliases and module shims
jenshnielsen May 4, 2026
1af99fa
Remove deprecated Galil driver aliases
jenshnielsen May 4, 2026
2b03a2e
Remove deprecated Rigol driver module shims
jenshnielsen May 4, 2026
02eac7c
Remove deprecated Rohde & Schwarz driver alias
jenshnielsen May 4, 2026
f19ddda
Remove deprecated Mini-Circuits driver aliases
jenshnielsen May 4, 2026
80124fa
Remove deprecated Signal Hound driver alias
jenshnielsen May 4, 2026
8957768
Remove deprecated Stanford Research Systems driver alias
jenshnielsen May 4, 2026
1372d75
Remove deprecated Oxford Instruments driver aliases
jenshnielsen May 4, 2026
d288642
Remove deprecated Tektronix driver aliases
jenshnielsen May 4, 2026
c24be2b
Remove deprecated Weinschel driver alias
jenshnielsen May 4, 2026
8a716f9
Remove deprecated Yokogawa driver aliases
jenshnielsen May 4, 2026
e98bebb
Remove deprecated Keysight driver aliases
jenshnielsen May 4, 2026
d6c3037
Fix import formatting in AlazarTech files
jenshnielsen May 4, 2026
43e8a6f
Fix ruff formatting after deprecation removal
jenshnielsen May 4, 2026
7bed895
Consolidate newsfragments into single breaking change entry
jenshnielsen May 4, 2026
17aad04
Remove leftover Keithley shim modules from tektronix
jenshnielsen May 4, 2026
7aeea27
Remove leftover Keysight shim modules
jenshnielsen May 4, 2026
6e2bc57
Remove leftover Mini-Circuits shim modules
jenshnielsen May 4, 2026
93d2d87
Remove leftover Signal Hound and Rohde & Schwarz shim modules
jenshnielsen May 4, 2026
05e8287
Remove stale ruff F401 per-file ignores for deleted files
jenshnielsen May 4, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/changes/newsfragments/8060.breaking
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Legacy backwards-compatibility aliases across the ``instrument_drivers`` module that were
deprecated in QCoDeS 0.57.0 have been removed. This includes deprecated class aliases and
deprecated module shims for AlazarTech, Basel, Galil, HP, Ithaco, Keithley, Keysight,
Mini-Circuits, Oxford Instruments, Rigol, Rohde & Schwarz, Signal Hound,
Stanford Research Systems, Tektronix, Weinschel, and Yokogawa drivers. Users should
migrate to the canonical class names listed in the 0.57.0 changelog.
23 changes: 0 additions & 23 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -271,29 +271,6 @@ allowed-confusables = ["µ"]
known-first-party = ["qcodes"]

[tool.ruff.lint.per-file-ignores]
# deprecated modules left
# for backwards compatibility
"src/qcodes/instrument_drivers/AimTTi/AimTTi_PL601P_channels.py" = ["F401"]
"src/qcodes/instrument_drivers/tektronix/Keithley_6500.py" = ["F401"]
"src/qcodes/instrument_drivers/tektronix/Keithley_2600_channels.py" = ["F401"]
"src/qcodes/instrument_drivers/tektronix/Keithley_2450.py" = ["F401"]
"src/qcodes/instrument_drivers/tektronix/keithley_7510.py" = ["F401"]
"src/qcodes/instrument_drivers/signal_hound/USB_SA124B.py" = ["F401"]
"src/qcodes/instrument_drivers/rohde_schwarz/RTE1000.py" = ["F401"]
"src/qcodes/instrument_drivers/rigol/DS4000.py" = ["F401"]
"src/qcodes/instrument_drivers/rigol/DG4000.py" = ["F401"]
"src/qcodes/instrument_drivers/rigol/DP832.py" = ["F401"]
"src/qcodes/instrument_drivers/rigol/DP831.py" = ["F401"]
"src/qcodes/instrument_drivers/rigol/DP821.py" = ["F401"]
"src/qcodes/instrument_drivers/rigol/DS1074Z.py" = ["F401"]
"src/qcodes/instrument_drivers/rigol/DG1062.py" = ["F401"]
"src/qcodes/instrument_drivers/devices.py" = ["F401"]
"src/qcodes/instrument_drivers/basel/sp983c_remote.py" = ["F401"]
"src/qcodes/instrument_drivers/Minicircuits/RUDAT_13G_90.py" = ["F401"]
"src/qcodes/instrument_drivers/HP/HP8133A.py" = ["F401"]
"src/qcodes/instrument_drivers/HP/HP8753D.py" = ["F401"]
"src/qcodes/instrument_drivers/Keysight/N9030B.py" = ["F401"]

# TID253 these imports are fine at module level
# in tests and examples
"docs/*" = ["TID253"]
Expand Down
15 changes: 0 additions & 15 deletions src/qcodes/instrument_drivers/AlazarTech/ATS9360.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

import numpy as np
from packaging import version
from typing_extensions import deprecated

from qcodes import validators
from qcodes.utils.deprecate import QCoDeSDeprecationWarning

from .ATS import AlazarTechATS
from .utils import TraceParameter
Expand Down Expand Up @@ -482,16 +480,3 @@ def _set_trigger_holdoff(self, value: bool) -> None:
disable_mask = ~np.uint32(1 << 26)
new_value = current_value & disable_mask
self._write_register(58, int(new_value))


@deprecated(
"AlazarTech_ATS9360 is deprecated. Please use qcodes.instrument_drivers.AlazarTech.AlazarTechATS9360 instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class AlazarTech_ATS9360(AlazarTechATS9360):
"""
Alias for backwards compatibility. Will eventually be deprecated and removed
"""

pass
15 changes: 0 additions & 15 deletions src/qcodes/instrument_drivers/AlazarTech/ATS9373.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

import numpy as np
from packaging import version
from typing_extensions import deprecated

from qcodes import validators
from qcodes.instrument_drivers.AlazarTech.ATS import AlazarTechATS
from qcodes.instrument_drivers.AlazarTech.utils import TraceParameter
from qcodes.utils.deprecate import QCoDeSDeprecationWarning

if TYPE_CHECKING:
from qcodes.parameters import Parameter
Expand Down Expand Up @@ -497,16 +495,3 @@ def _set_trigger_holdoff(self, value: bool) -> None:
disable_mask = ~np.uint32(1 << 26)
new_value = current_value & disable_mask
self._write_register(58, int(new_value))


@deprecated(
"AlazarTech_ATS9373 is deprecated. Please use qcodes.instrument_drivers.AlazarTech.AlazarTechATS9373 instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class AlazarTech_ATS9373(AlazarTechATS9373):
"""
Alias for backwards compatibility. Will eventually be deprecated and removed
"""

pass
16 changes: 0 additions & 16 deletions src/qcodes/instrument_drivers/AlazarTech/ATS9440.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
from typing import TYPE_CHECKING, Any

from typing_extensions import deprecated

from qcodes import validators
from qcodes.utils.deprecate import QCoDeSDeprecationWarning

from .ATS import AlazarTechATS
from .utils import TraceParameter
Expand Down Expand Up @@ -398,16 +395,3 @@ def __init__(
vals=validators.Ints(min_value=0),
)
"""Parameter buffer_timeout"""


@deprecated(
"AlazarTech_ATS9440 is deprecated. Please use qcodes.instrument_drivers.AlazarTech.AlazarTechATS9440 instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class AlazarTech_ATS9440(AlazarTechATS9440):
"""
Alias for backwards compatibility. Will eventually be deprecated and removed
"""

pass
16 changes: 0 additions & 16 deletions src/qcodes/instrument_drivers/AlazarTech/ATS9870.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
from typing import TYPE_CHECKING, Any

from typing_extensions import deprecated

from qcodes import validators
from qcodes.utils.deprecate import QCoDeSDeprecationWarning

from .ATS import AlazarTechATS
from .utils import TraceParameter
Expand Down Expand Up @@ -406,16 +403,3 @@ def __init__(
raise Exception(
f"The Alazar board kind is not 'ATS9870', found '{model!s}' instead."
)


@deprecated(
"AlazarTech_ATS9870 is deprecated. Please use qcodes.instrument_drivers.AlazarTech.AlazarTechATS9870 instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class AlazarTech_ATS9870(AlazarTechATS9870):
"""
Alias for backwards compatibility. Will eventually be deprecated and removed
"""

pass
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

import numpy as np
import numpy.typing as npt
from typing_extensions import deprecated

from qcodes.utils.deprecate import QCoDeSDeprecationWarning

from .ATS import AcquisitionController

Expand Down Expand Up @@ -167,16 +164,3 @@ def fit(self, buf: npt.NDArray) -> tuple[float, float]:

# see manual page 52!!! (using unsigned data)
return ampl, math.atan2(ImPart, RePart) * 360 / (2 * math.pi)


@deprecated(
"Demodulation_AcquisitionController is deprecated. Please use qcodes.instrument_drivers.AlazarTech.DemodulationAcquisitionController instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class Demodulation_AcquisitionController(DemodulationAcquisitionController):
"""
Alias for backwards compatibility. Will eventually be deprecated and removed
"""

pass
54 changes: 0 additions & 54 deletions src/qcodes/instrument_drivers/Galil/dmc_41x3.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@

import numpy as np
import numpy.typing as npt
from typing_extensions import deprecated

from qcodes.instrument import Instrument, InstrumentBaseKWArgs, InstrumentChannel
from qcodes.utils.deprecate import QCoDeSDeprecationWarning
from qcodes.validators import Enum, Ints, Multiples

if TYPE_CHECKING:
Expand Down Expand Up @@ -250,19 +248,6 @@ def clear_sequence(self, coord_sys: str) -> None:
self.write(f"CS {coord_sys}")


@deprecated(
"VectorMode is deprecated. Please use qcodes.instrument_drivers.Galil.GalilDMC4133VectorMode instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class VectorMode(GalilDMC4133VectorMode):
"""
Alias for backwards compatibility
"""

pass


class GalilDMC4133Motor(InstrumentChannel["GalilDMC4133Controller"]):
"""
Class to control a single motor (independent of possible other motors)
Expand Down Expand Up @@ -479,19 +464,6 @@ def error_magnitude(self) -> float:
return float(self.ask(f"QS{self._axis}=?"))


@deprecated(
"Motor is deprecated. Please use qcodes.instrument_drivers.Galil.GalilDMC4133Motor instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class Motor(GalilDMC4133Motor):
"""
Alias for backwards compatibility
"""

pass


class GalilDMC4133Controller(GalilMotionController):
"""
Driver for Galil DMC-4133 Controller
Expand Down Expand Up @@ -645,19 +617,6 @@ def wait_till_motion_complete(self) -> None:
self.motors_off()


@deprecated(
"DMC4133Controller is deprecated. Please use qcodes.instrument_drivers.Galil.GalilDMC4133Controller instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class DMC4133Controller(GalilDMC4133Controller):
"""
Alias for backwards compatibility
"""

pass


class GalilDMC4133Arm:
"""
Module to control probe arm. It is assumed that the chip to be probed has
Expand Down Expand Up @@ -1166,16 +1125,3 @@ def _calculate_vector_component(vec: float, val: int) -> int:
assert return_val % 1024 == 0

return return_val


@deprecated(
"Arm is deprecated. Please use qcodes.instrument_drivers.Galil.GalilDMC4133Arm instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class Arm(GalilDMC4133Arm):
"""
Alias for backwards compatibility
"""

pass
16 changes: 0 additions & 16 deletions src/qcodes/instrument_drivers/HP/HP8133A.py

This file was deleted.

16 changes: 0 additions & 16 deletions src/qcodes/instrument_drivers/HP/HP8753D.py

This file was deleted.

15 changes: 0 additions & 15 deletions src/qcodes/instrument_drivers/HP/HP_83650A.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
import logging
from typing import TYPE_CHECKING

from typing_extensions import deprecated

from qcodes import validators as vals
from qcodes.instrument import VisaInstrument, VisaInstrumentKWArgs
from qcodes.utils.deprecate import QCoDeSDeprecationWarning

if TYPE_CHECKING:
from typing import Unpack
Expand Down Expand Up @@ -166,15 +163,3 @@ def print_modstatus(self) -> None:
print(f"{self.amstatus.label}: {self.amstatus.get()}")
print(f"{self.pulsestatus.label}: {self.pulsestatus.get()}")
print(f"{self.pulsesource.label}: {self.pulsesource.get()}")


@deprecated(
"HP_83650A is deprecated. Please use qcodes.instrument_drivers.HP.HP83650A instead.",
category=QCoDeSDeprecationWarning,
stacklevel=1,
)
class HP_83650A(HP83650A):
"""
Alias of HP83650A for backwards compatibility.
Will eventually be deprecated and removed.
"""
Loading
Loading