Skip to content

Commit 0a13dca

Browse files
jenshnielsenjenshnielsen
authored
Merge pull request #8093 from jenshnielsen/remove_057_deprecated
Remove deprecated driver aliases
2 parents a07132b + 05e8287 commit 0a13dca

63 files changed

Lines changed: 20 additions & 2218 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/changes/newsfragments/8060.breaking‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Legacy backwards-compatibility aliases across the ``instrument_drivers`` module that were
2+
deprecated in QCoDeS 0.57.0 have been removed. This includes deprecated class aliases and
3+
deprecated module shims for AlazarTech, Basel, Galil, HP, Ithaco, Keithley, Keysight,
4+
Mini-Circuits, Oxford Instruments, Rigol, Rohde & Schwarz, Signal Hound,
5+
Stanford Research Systems, Tektronix, Weinschel, and Yokogawa drivers. Users should
6+
migrate to the canonical class names listed in the 0.57.0 changelog.

‎pyproject.toml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -271,29 +271,6 @@ allowed-confusables = ["µ"]
271271
known-first-party = ["qcodes"]
272272

273273
[tool.ruff.lint.per-file-ignores]
274-
# deprecated modules left
275-
# for backwards compatibility
276-
"src/qcodes/instrument_drivers/AimTTi/AimTTi_PL601P_channels.py" = ["F401"]
277-
"src/qcodes/instrument_drivers/tektronix/Keithley_6500.py" = ["F401"]
278-
"src/qcodes/instrument_drivers/tektronix/Keithley_2600_channels.py" = ["F401"]
279-
"src/qcodes/instrument_drivers/tektronix/Keithley_2450.py" = ["F401"]
280-
"src/qcodes/instrument_drivers/tektronix/keithley_7510.py" = ["F401"]
281-
"src/qcodes/instrument_drivers/signal_hound/USB_SA124B.py" = ["F401"]
282-
"src/qcodes/instrument_drivers/rohde_schwarz/RTE1000.py" = ["F401"]
283-
"src/qcodes/instrument_drivers/rigol/DS4000.py" = ["F401"]
284-
"src/qcodes/instrument_drivers/rigol/DG4000.py" = ["F401"]
285-
"src/qcodes/instrument_drivers/rigol/DP832.py" = ["F401"]
286-
"src/qcodes/instrument_drivers/rigol/DP831.py" = ["F401"]
287-
"src/qcodes/instrument_drivers/rigol/DP821.py" = ["F401"]
288-
"src/qcodes/instrument_drivers/rigol/DS1074Z.py" = ["F401"]
289-
"src/qcodes/instrument_drivers/rigol/DG1062.py" = ["F401"]
290-
"src/qcodes/instrument_drivers/devices.py" = ["F401"]
291-
"src/qcodes/instrument_drivers/basel/sp983c_remote.py" = ["F401"]
292-
"src/qcodes/instrument_drivers/Minicircuits/RUDAT_13G_90.py" = ["F401"]
293-
"src/qcodes/instrument_drivers/HP/HP8133A.py" = ["F401"]
294-
"src/qcodes/instrument_drivers/HP/HP8753D.py" = ["F401"]
295-
"src/qcodes/instrument_drivers/Keysight/N9030B.py" = ["F401"]
296-
297274
# TID253 these imports are fine at module level
298275
# in tests and examples
299276
"docs/*" = ["TID253"]

‎src/qcodes/instrument_drivers/AlazarTech/ATS9360.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import numpy as np
44
from packaging import version
5-
from typing_extensions import deprecated
65

76
from qcodes import validators
8-
from qcodes.utils.deprecate import QCoDeSDeprecationWarning
97

108
from .ATS import AlazarTechATS
119
from .utils import TraceParameter
@@ -482,16 +480,3 @@ def _set_trigger_holdoff(self, value: bool) -> None:
482480
disable_mask = ~np.uint32(1 << 26)
483481
new_value = current_value & disable_mask
484482
self._write_register(58, int(new_value))
485-
486-
487-
@deprecated(
488-
"AlazarTech_ATS9360 is deprecated. Please use qcodes.instrument_drivers.AlazarTech.AlazarTechATS9360 instead.",
489-
category=QCoDeSDeprecationWarning,
490-
stacklevel=1,
491-
)
492-
class AlazarTech_ATS9360(AlazarTechATS9360):
493-
"""
494-
Alias for backwards compatibility. Will eventually be deprecated and removed
495-
"""
496-
497-
pass

‎src/qcodes/instrument_drivers/AlazarTech/ATS9373.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
import numpy as np
44
from packaging import version
5-
from typing_extensions import deprecated
65

76
from qcodes import validators
87
from qcodes.instrument_drivers.AlazarTech.ATS import AlazarTechATS
98
from qcodes.instrument_drivers.AlazarTech.utils import TraceParameter
10-
from qcodes.utils.deprecate import QCoDeSDeprecationWarning
119

1210
if TYPE_CHECKING:
1311
from qcodes.parameters import Parameter
@@ -497,16 +495,3 @@ def _set_trigger_holdoff(self, value: bool) -> None:
497495
disable_mask = ~np.uint32(1 << 26)
498496
new_value = current_value & disable_mask
499497
self._write_register(58, int(new_value))
500-
501-
502-
@deprecated(
503-
"AlazarTech_ATS9373 is deprecated. Please use qcodes.instrument_drivers.AlazarTech.AlazarTechATS9373 instead.",
504-
category=QCoDeSDeprecationWarning,
505-
stacklevel=1,
506-
)
507-
class AlazarTech_ATS9373(AlazarTechATS9373):
508-
"""
509-
Alias for backwards compatibility. Will eventually be deprecated and removed
510-
"""
511-
512-
pass

‎src/qcodes/instrument_drivers/AlazarTech/ATS9440.py‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
from typing import TYPE_CHECKING, Any
22

3-
from typing_extensions import deprecated
4-
53
from qcodes import validators
6-
from qcodes.utils.deprecate import QCoDeSDeprecationWarning
74

85
from .ATS import AlazarTechATS
96
from .utils import TraceParameter
@@ -398,16 +395,3 @@ def __init__(
398395
vals=validators.Ints(min_value=0),
399396
)
400397
"""Parameter buffer_timeout"""
401-
402-
403-
@deprecated(
404-
"AlazarTech_ATS9440 is deprecated. Please use qcodes.instrument_drivers.AlazarTech.AlazarTechATS9440 instead.",
405-
category=QCoDeSDeprecationWarning,
406-
stacklevel=1,
407-
)
408-
class AlazarTech_ATS9440(AlazarTechATS9440):
409-
"""
410-
Alias for backwards compatibility. Will eventually be deprecated and removed
411-
"""
412-
413-
pass

‎src/qcodes/instrument_drivers/AlazarTech/ATS9870.py‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
from typing import TYPE_CHECKING, Any
22

3-
from typing_extensions import deprecated
4-
53
from qcodes import validators
6-
from qcodes.utils.deprecate import QCoDeSDeprecationWarning
74

85
from .ATS import AlazarTechATS
96
from .utils import TraceParameter
@@ -406,16 +403,3 @@ def __init__(
406403
raise Exception(
407404
f"The Alazar board kind is not 'ATS9870', found '{model!s}' instead."
408405
)
409-
410-
411-
@deprecated(
412-
"AlazarTech_ATS9870 is deprecated. Please use qcodes.instrument_drivers.AlazarTech.AlazarTechATS9870 instead.",
413-
category=QCoDeSDeprecationWarning,
414-
stacklevel=1,
415-
)
416-
class AlazarTech_ATS9870(AlazarTechATS9870):
417-
"""
418-
Alias for backwards compatibility. Will eventually be deprecated and removed
419-
"""
420-
421-
pass

‎src/qcodes/instrument_drivers/AlazarTech/ATS_acquisition_controllers.py‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33

44
import numpy as np
55
import numpy.typing as npt
6-
from typing_extensions import deprecated
7-
8-
from qcodes.utils.deprecate import QCoDeSDeprecationWarning
96

107
from .ATS import AcquisitionController
118

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

168165
# see manual page 52!!! (using unsigned data)
169166
return ampl, math.atan2(ImPart, RePart) * 360 / (2 * math.pi)
170-
171-
172-
@deprecated(
173-
"Demodulation_AcquisitionController is deprecated. Please use qcodes.instrument_drivers.AlazarTech.DemodulationAcquisitionController instead.",
174-
category=QCoDeSDeprecationWarning,
175-
stacklevel=1,
176-
)
177-
class Demodulation_AcquisitionController(DemodulationAcquisitionController):
178-
"""
179-
Alias for backwards compatibility. Will eventually be deprecated and removed
180-
"""
181-
182-
pass

‎src/qcodes/instrument_drivers/Galil/dmc_41x3.py‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88

99
import numpy as np
1010
import numpy.typing as npt
11-
from typing_extensions import deprecated
1211

1312
from qcodes.instrument import Instrument, InstrumentBaseKWArgs, InstrumentChannel
14-
from qcodes.utils.deprecate import QCoDeSDeprecationWarning
1513
from qcodes.validators import Enum, Ints, Multiples
1614

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

252250

253-
@deprecated(
254-
"VectorMode is deprecated. Please use qcodes.instrument_drivers.Galil.GalilDMC4133VectorMode instead.",
255-
category=QCoDeSDeprecationWarning,
256-
stacklevel=1,
257-
)
258-
class VectorMode(GalilDMC4133VectorMode):
259-
"""
260-
Alias for backwards compatibility
261-
"""
262-
263-
pass
264-
265-
266251
class GalilDMC4133Motor(InstrumentChannel["GalilDMC4133Controller"]):
267252
"""
268253
Class to control a single motor (independent of possible other motors)
@@ -479,19 +464,6 @@ def error_magnitude(self) -> float:
479464
return float(self.ask(f"QS{self._axis}=?"))
480465

481466

482-
@deprecated(
483-
"Motor is deprecated. Please use qcodes.instrument_drivers.Galil.GalilDMC4133Motor instead.",
484-
category=QCoDeSDeprecationWarning,
485-
stacklevel=1,
486-
)
487-
class Motor(GalilDMC4133Motor):
488-
"""
489-
Alias for backwards compatibility
490-
"""
491-
492-
pass
493-
494-
495467
class GalilDMC4133Controller(GalilMotionController):
496468
"""
497469
Driver for Galil DMC-4133 Controller
@@ -645,19 +617,6 @@ def wait_till_motion_complete(self) -> None:
645617
self.motors_off()
646618

647619

648-
@deprecated(
649-
"DMC4133Controller is deprecated. Please use qcodes.instrument_drivers.Galil.GalilDMC4133Controller instead.",
650-
category=QCoDeSDeprecationWarning,
651-
stacklevel=1,
652-
)
653-
class DMC4133Controller(GalilDMC4133Controller):
654-
"""
655-
Alias for backwards compatibility
656-
"""
657-
658-
pass
659-
660-
661620
class GalilDMC4133Arm:
662621
"""
663622
Module to control probe arm. It is assumed that the chip to be probed has
@@ -1166,16 +1125,3 @@ def _calculate_vector_component(vec: float, val: int) -> int:
11661125
assert return_val % 1024 == 0
11671126

11681127
return return_val
1169-
1170-
1171-
@deprecated(
1172-
"Arm is deprecated. Please use qcodes.instrument_drivers.Galil.GalilDMC4133Arm instead.",
1173-
category=QCoDeSDeprecationWarning,
1174-
stacklevel=1,
1175-
)
1176-
class Arm(GalilDMC4133Arm):
1177-
"""
1178-
Alias for backwards compatibility
1179-
"""
1180-
1181-
pass

‎src/qcodes/instrument_drivers/HP/HP8133A.py‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/qcodes/instrument_drivers/HP/HP8753D.py‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)