From b3b461d401f28ccc2429219ad3da95fc915073bb Mon Sep 17 00:00:00 2001 From: Jens Peter Secher Date: Tue, 9 Jan 2024 15:46:05 +0100 Subject: [PATCH] Clean up warnings --- .../tests/QDevil/test_sim_qdac2_abstract_channel.py | 2 +- .../tests/QDevil/test_sim_qdac2_array.py | 10 +++++----- .../tests/QDevil/test_sim_qdac2_awg.py | 8 ++++---- .../tests/QDevil/test_sim_qdac2_current.py | 10 +++++----- .../tests/QDevil/test_sim_qdac2_init.py | 1 + .../tests/QDevil/test_sim_qdac2_leakage.py | 4 ++-- .../tests/QDevil/test_sim_qdac2_sine.py | 4 ++-- .../tests/QDevil/test_sim_qdac2_source_dc.py | 8 ++++---- .../tests/QDevil/test_sim_qdac2_source_list.py | 6 +++--- .../tests/QDevil/test_sim_qdac2_source_sweep.py | 4 ++-- .../tests/QDevil/test_sim_qdac2_square.py | 4 ++-- .../tests/QDevil/test_sim_qdac2_triangle.py | 4 ++-- .../tests/QDevil/test_sim_qdac2_virtual_gates.py | 2 +- 13 files changed, 34 insertions(+), 33 deletions(-) diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_abstract_channel.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_abstract_channel.py index c802bf275..e27a74ebc 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_abstract_channel.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_abstract_channel.py @@ -8,7 +8,7 @@ def test_various_operations_have_common_functions(qdac): # noqa qdac.ch02.sine_wave(), qdac.ch03.triangle_wave(), qdac.ch04.dc_sweep(start_V=-1, stop_V=1, points=11), - qdac.ch05.dc_list(voltages=(-1,0,1)), + qdac.ch05.dc_list(voltages=(-1, 0, 1)), qdac.ch05.measurement() ] # ----------------------------------------------------------------------- diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py index 45fbe4080..78dc5dcd5 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_array.py @@ -1,5 +1,5 @@ import pytest -from unittest.mock import MagicMock, call +from unittest.mock import call from qcodes_contrib_drivers.drivers.QDevil.QDAC2 import QDac2 from qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array import QDac2_Array from .sim_qdac2_fixtures import qdac, qdac2 # noqa @@ -96,7 +96,7 @@ def test_fails_on_non_unique_contact_names(qdac, qdac2): # noqa listener: {'sensorA': 2, 'plungerB': 3} }) # ----------------------------------------------------------------------- - assert f'Contact name sensorA used multiple times' in repr(error) + assert 'Contact name sensorA used multiple times' in repr(error) def test_internal_connect_to_trigger_out(qdac, qdac2): # noqa @@ -176,7 +176,7 @@ def test_set_virtual_voltages_goes_to_correct_qdac(qdac, qdac2): # noqa def test_sync_steady_state(qdac, qdac2, mocker): # noqa - sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array.sleep_s') # Don't sleep + sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array.sleep_s') # Don't sleep qdacs, controller, listener = two_qdacs(qdac, qdac2) contacts = {controller: {'A': 2, 'B': 1}, listener: {'C': 3}} arrangement = qdacs.arrange(contacts) @@ -208,7 +208,7 @@ def test_sync_steady_state(qdac, qdac2, mocker): # noqa def test_sync_leakage(qdac, qdac2, mocker): # noqa - sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array.sleep_s') # Don't sleep + mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2_Array.sleep_s') # Don't sleep qdacs, controller, listener = two_qdacs(qdac, qdac2) contacts = {controller: {'A': 3}, listener: {'B': 1, 'C': 2}} arrangement = qdacs.arrange(contacts) @@ -298,7 +298,7 @@ def test_frees_internal_triggers_on_exit(qdac, qdac2): # noqa qdacs, controller, listener = two_qdacs(qdac, qdac2) contacts = {controller: {'A': 2, 'B': 1}, listener: {'C': 3}} # ----------------------------------------------------------------------- - with qdacs.arrange(contacts, internal_triggers=['starter']) as arrangement: + with qdacs.arrange(contacts, internal_triggers=['starter']): pass # ----------------------------------------------------------------------- assert qdac.n_triggers() == len(qdac._internal_triggers) diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py index bf53840aa..935905b24 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_awg.py @@ -292,7 +292,7 @@ def test_awg_trigger_on_internal(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour5:awg:trig:sour int{trigger.value}', - f'sour5:awg:init:cont on', + 'sour5:awg:init:cont on', ] @@ -306,7 +306,7 @@ def test_awg_trigger_once_on_internal(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour5:awg:trig:sour int{trigger.value}', - f'sour5:awg:init:cont off', + 'sour5:awg:init:cont off', ] @@ -320,7 +320,7 @@ def test_awg_trigger_on_external(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour5:awg:trig:sour ext{trigger}', - f'sour5:awg:init:cont on', + 'sour5:awg:init:cont on', ] @@ -334,5 +334,5 @@ def test_awg_trigger_once_on_external(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour5:awg:trig:sour ext{trigger}', - f'sour5:awg:init:cont off', + 'sour5:awg:init:cont off', ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py index 183155c8a..847803270 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_current.py @@ -67,7 +67,7 @@ def test_measurement_trigger_on_internal(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sens2:trig:sour int{trigger.value}', - f'sens2:init:cont on', + 'sens2:init:cont on', ] @@ -80,7 +80,7 @@ def test_measurement_trigger_once_on_internal(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sens2:trig:sour int{trigger.value}', - f'sens2:init:cont off', + 'sens2:init:cont off', ] @@ -106,7 +106,7 @@ def test_measurement_trigger_on_external(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sens2:trig:sour ext{trigger}', - f'sens2:init:cont on', + 'sens2:init:cont on', ] @@ -119,7 +119,7 @@ def test_measurement_trigger_once_on_external(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sens2:trig:sour ext{trigger}', - f'sens2:init:cont off', + 'sens2:init:cont off', ] @@ -352,7 +352,7 @@ def test_current_trigger_on_internal(qdac): # noqa def test_current_cleanup_triggering_on_exit(qdac): # noqa # ----------------------------------------------------------------------- - with qdac.ch02.measurement() as measurement: + with qdac.ch02.measurement(): qdac.start_recording_scpi() # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py index 1fc33e2c8..81e315592 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py @@ -3,6 +3,7 @@ from qcodes.instrument.base import Instrument from .sim_qdac2_fixtures import visalib + @pytest.mark.parametrize('version,components', [ ('3-0.9.6', ['3', '0.9.6']), ('10.2-1.14', ['10.2', '1.14']) diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_leakage.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_leakage.py index 6722ed27f..5477ca57b 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_leakage.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_leakage.py @@ -14,8 +14,8 @@ def test_diff_matrix(): assert np.allclose(diff, expected) -def test_arrangement_steady_state(qdac, mocker): - sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2.sleep_s') # Don't sleep +def test_arrangement_steady_state(qdac, mocker): # noqa + sleep_s = mocker.patch('qcodes_contrib_drivers.drivers.QDevil.QDAC2.sleep_s') # Don't sleep gates = {'sensor1': 1, 'plunger2': 2, 'plunger3': 3} arrangement = qdac.arrange(gates) qdac.start_recording_scpi() diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py index a65a7c6ae..3e4a82677 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_sine.py @@ -233,7 +233,7 @@ def test_sine_trigger_on_internal(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:sine:trig:sour int{trigger.value}', - f'sour1:sine:init:cont on', + 'sour1:sine:init:cont on', ] @@ -246,5 +246,5 @@ def test_sine_trigger_on_external(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:sine:trig:sour ext{trigger}', - f'sour1:sine:init:cont on', + 'sour1:sine:init:cont on', ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_dc.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_dc.py index b6b1d0f54..374b2c5be 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_dc.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_dc.py @@ -30,7 +30,7 @@ def test_voltage_range_low_min(qdac): # noqa voltage = qdac.ch02.output_low_range_minimum_V() # ----------------------------------------------------------------------- assert -10 < voltage < 10 - assert qdac.get_recorded_scpi_commands() == [f'sour2:rang:low:min?'] + assert qdac.get_recorded_scpi_commands() == ['sour2:rang:low:min?'] def test_voltage_range_low_max(qdac): # noqa @@ -38,7 +38,7 @@ def test_voltage_range_low_max(qdac): # noqa voltage = qdac.ch02.output_low_range_maximum_V() # ----------------------------------------------------------------------- assert -10 < voltage < 10 - assert qdac.get_recorded_scpi_commands() == [f'sour2:rang:low:max?'] + assert qdac.get_recorded_scpi_commands() == ['sour2:rang:low:max?'] def test_voltage_range_high_min(qdac): # noqa @@ -46,7 +46,7 @@ def test_voltage_range_high_min(qdac): # noqa voltage = qdac.ch02.output_high_range_minimum_V() # ----------------------------------------------------------------------- assert -10 < voltage < 10 - assert qdac.get_recorded_scpi_commands() == [f'sour2:rang:high:min?'] + assert qdac.get_recorded_scpi_commands() == ['sour2:rang:high:min?'] def test_voltage_range_high_max(qdac): # noqa @@ -54,7 +54,7 @@ def test_voltage_range_high_max(qdac): # noqa voltage = qdac.ch02.output_high_range_maximum_V() # ----------------------------------------------------------------------- assert -10 < voltage < 10 - assert qdac.get_recorded_scpi_commands() == [f'sour2:rang:high:max?'] + assert qdac.get_recorded_scpi_commands() == ['sour2:rang:high:max?'] @pytest.mark.parametrize('selector', ['dc', 'med', 'high']) diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py index 8fa8b3bf3..d66ff8fba 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_list.py @@ -230,7 +230,7 @@ def test_list_trigger_on_internal(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:dc:trig:sour int{trigger.value}', - f'sour1:dc:init:cont on', + 'sour1:dc:init:cont on', ] @@ -243,7 +243,7 @@ def test_list_trigger_on_external(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:dc:trig:sour ext{trigger}', - f'sour1:dc:init:cont on', + 'sour1:dc:init:cont on', ] @@ -276,7 +276,7 @@ def test_list_get_voltages(qdac): # noqa def test_list_cleanup_triggering_on_exit(qdac): # noqa # ----------------------------------------------------------------------- - with qdac.ch01.dc_list(voltages=range(1, 5)) as dc_list: + with qdac.ch01.dc_list(voltages=range(1, 5)): qdac.start_recording_scpi() # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py index bb5971a9c..4358b7e31 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_source_sweep.py @@ -235,7 +235,7 @@ def test_sweep_trigger_on_internal(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:dc:trig:sour int{trigger.value}', - f'sour1:dc:init:cont on', + 'sour1:dc:init:cont on', ] @@ -248,7 +248,7 @@ def test_sweep_trigger_on_external(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:dc:trig:sour ext{trigger}', - f'sour1:dc:init:cont on', + 'sour1:dc:init:cont on', ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py index f19742cd7..e236fc032 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_square.py @@ -286,7 +286,7 @@ def test_square_trigger_on_internal(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:squ:trig:sour int{trigger.value}', - f'sour1:squ:init:cont on', + 'sour1:squ:init:cont on', ] @@ -299,7 +299,7 @@ def test_square_trigger_on_external(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:squ:trig:sour ext{trigger}', - f'sour1:squ:init:cont on', + 'sour1:squ:init:cont on', ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py index 86a29a065..f9f20c559 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_triangle.py @@ -260,7 +260,7 @@ def test_triangle_trigger_on_internal(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:tri:trig:sour int{trigger.value}', - f'sour1:tri:init:cont on', + 'sour1:tri:init:cont on', ] @@ -273,5 +273,5 @@ def test_triangle_trigger_on_external(qdac): # noqa # ----------------------------------------------------------------------- assert qdac.get_recorded_scpi_commands() == [ f'sour1:tri:trig:sour ext{trigger}', - f'sour1:tri:init:cont on', + 'sour1:tri:init:cont on', ] diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py index bbc137247..b2420891e 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_virtual_gates.py @@ -323,7 +323,7 @@ def test_arrangement_sweep_outer_trigger(qdac): # noqa outer_trigger_channel=1) qdac.start_recording_scpi() # ----------------------------------------------------------------------- - sweep = arrangement.virtual_sweep2d( + arrangement.virtual_sweep2d( inner_contact='plunger1', inner_voltages=np.linspace(-1, 1, 5), outer_contact='plunger2',