From d12d6515753daf3a914f4fcec509e94bf55d5077 Mon Sep 17 00:00:00 2001 From: Mike Cousins Date: Thu, 9 Jun 2022 10:37:58 -0400 Subject: [PATCH] style(python): remove line length limit from flake8 config Closes #9931 --- api/.flake8 | 9 +-- api/setup.py | 2 +- .../opentrons/calibration_storage/modify.py | 8 +- .../drivers/smoothie_drivers/driver_3_0.py | 2 +- .../protocol_api/instrument_context.py | 6 +- api/src/opentrons/protocol_api/labware.py | 2 +- .../execution/command_executor.py | 2 +- .../protocol_reader/file_reader_writer.py | 2 +- .../protocol_runner/legacy_command_mapper.py | 14 ++-- .../protocols/api_support/instrument.py | 2 +- .../context/protocol_api/protocol_context.py | 2 +- .../context/simulator/protocol_context.py | 2 +- .../protocols/execution/json_dispatchers.py | 14 ++-- .../protocols/models/json_protocol.py | 4 +- api/src/opentrons/protocols/types.py | 2 +- api/src/opentrons/simulate.py | 2 +- api/src/opentrons/system/camera.py | 2 +- api/src/opentrons/util/linal.py | 2 +- .../opentrons/drivers/rpi_drivers/test_usb.py | 6 +- .../smoothie_drivers/test_connection.py | 2 +- .../modules/test_hc_thermocycler.py | 2 +- .../opentrons/protocol_api/test_labware.py | 6 +- .../opentrons/protocol_api/test_offsets.py | 26 +++---- .../test_magnetic_module_context.py | 2 +- .../test_set_and_wait_for_shake_speed.py | 2 +- .../test_set_target_temperature.py | 2 +- .../temperature_module/test_deactivate.py | 2 +- .../test_set_target_temperature.py | 2 +- .../test_wait_for_temperature.py | 2 +- .../test_set_target_block_temperature.py | 2 +- .../test_set_target_lid_temperature.py | 2 +- .../test_wait_for_block_temperature.py | 2 +- .../test_wait_for_lid_temperature.py | 2 +- .../state/test_module_store.py | 14 ++-- .../execution/test_execute_json_v4.py | 8 +- api/tests/opentrons/system/test_wifi.py | 2 +- api/tests/opentrons/test_execute.py | 10 +-- api/tests/opentrons/test_simulate.py | 10 +-- api/tests/opentrons/util/test_linal.py | 2 +- g-code-testing/.flake8 | 11 ++- g-code-testing/g_code_parsing/g_code.py | 74 +++++++++---------- .../close_labware_latch_functionality_def.py | 2 +- ...t_labware_latch_state_functionality_def.py | 2 +- .../get_rpm_functionality_def.py | 2 +- .../get_temperature_functionality_def.py | 2 +- .../get_version_functionality_def.py | 4 +- .../heater_shaker/home_functionality_def.py | 2 +- .../open_labware_latch_functionality_def.py | 2 +- .../set_rpm_functionality_def.py | 2 +- .../set_temperature_functionality_def.py | 2 +- ...rrent_position_g_code_functionality_def.py | 2 +- .../device_info_g_code_functionality_def.py | 2 +- ...t_plate_height_g_code_functionality_def.py | 2 +- .../magdeck/home_g_code_functionality_def.py | 2 +- .../magdeck/move_g_code_functionality_def.py | 2 +- .../magdeck/probe_g_code_functionality_def.py | 2 +- ...oordinate_mode_g_code_functionality_def.py | 2 +- .../acceleration_g_code_functionality_def.py | 2 +- ...rrent_position_g_code_functionality_def.py | 2 +- ...isengage_motor_g_code_functionality_def.py | 2 +- .../dwell_g_code_functionality_def.py | 2 +- .../smoothie/home_g_code_functionality_def.py | 2 +- .../homing_status_g_code_functionality_def.py | 2 +- ..._switch_status_g_code_functionality_def.py | 2 +- ...ping_b_disable_g_code_functionality_def.py | 2 +- ...pping_b_enable_g_code_functionality_def.py | 2 +- ...ping_c_disable_g_code_functionality_def.py | 2 +- ...pping_c_enable_g_code_functionality_def.py | 2 +- .../smoothie/move_g_code_functionality_def.py | 2 +- .../pop_speed_g_code_functionality_def.py | 2 +- .../probe_g_code_functionality_def.py | 2 +- .../push_speed_g_code_functionality_def.py | 2 +- ..._instrument_id_g_code_functionality_def.py | 2 +- ...strument_model_g_code_functionality_def.py | 2 +- ...oordinate_mode_g_code_functionality_def.py | 2 +- ...set_from_error_g_code_functionality_def.py | 2 +- .../set_current_g_code_functionality_def.py | 2 +- .../set_max_speed_g_code_functionality_def.py | 2 +- ...pette_debounce_g_code_functionality_def.py | 2 +- ...t_pipette_home_g_code_functionality_def.py | 2 +- ...tte_max_travel_g_code_functionality_def.py | 2 +- ...ipette_retract_g_code_functionality_def.py | 2 +- .../set_speed_g_code_functionality_def.py | 2 +- .../steps_per_mm_g_code_functionality_def.py | 2 +- .../smoothie/wait_g_code_functionality_def.py | 2 +- ..._instrument_id_g_code_functionality_def.py | 2 +- ...strument_model_g_code_functionality_def.py | 2 +- .../device_info_g_code_functionality_def.py | 2 +- .../disengage_g_code_functionality_def.py | 2 +- .../get_temp_g_code_functionality_def.py | 2 +- .../set_temp_g_code_functionality_def.py | 2 +- .../close_lid_g_code_functionality_def.py | 2 +- ...deactivate_all_g_code_functionality_def.py | 2 +- ...activate_block_g_code_functionality_def.py | 2 +- ...deactivate_lid_g_code_functionality_def.py | 2 +- .../device_info_g_code_functionality_def.py | 2 +- ...dit_pid_params_g_code_functionality_def.py | 2 +- .../get_lid_temp_g_code_functionality_def.py | 2 +- ...get_plate_temp_g_code_functionality_def.py | 2 +- .../lid_status_g_code_functionality_def.py | 2 +- .../open_lid_g_code_functionality_def.py | 2 +- .../set_lid_temp_g_code_functionality_def.py | 2 +- ...set_plate_temp_g_code_functionality_def.py | 2 +- .../set_ramp_rate_g_code_functionality_def.py | 2 +- .../tests/g_code_parsing/test_g_code.py | 2 +- hardware/.flake8 | 9 +-- .../drivers/can_bus/can_messenger.py | 2 +- .../opentrons_hardware/scripts/can_comm.py | 2 +- .../opentrons_hardware/scripts/sensors.py | 2 +- hardware/setup.py | 2 +- notify-server/.flake8 | 11 ++- notify-server/notify_server/logging.py | 2 +- robot-server/.flake8 | 9 +-- .../robot/calibration/check/user_flow.py | 6 +- .../robot/calibration/deck/user_flow.py | 4 +- .../calibration/pipette_offset/user_flow.py | 2 +- .../robot/calibration/tip_length/user_flow.py | 6 +- robot-server/robot_server/service/logging.py | 2 +- .../session_types/deck_calibration_session.py | 2 +- .../http_api/protocols/test_persistence.py | 4 +- .../tests/modules/test_module_data_mapper.py | 26 +++---- .../tests/runs/test_run_data_manager.py | 30 ++++---- .../service/legacy/routers/test_settings.py | 4 +- .../tests/service/session/test_router.py | 8 +- shared-data/python/.flake8 | 9 +-- update-server/.flake8 | 9 +-- 126 files changed, 277 insertions(+), 276 deletions(-) diff --git a/api/.flake8 b/api/.flake8 index c345ab52642..d925fa1389a 100644 --- a/api/.flake8 +++ b/api/.flake8 @@ -1,15 +1,14 @@ [flake8] -# set line-length for future black support -# https://github.com/psf/black/blob/master/docs/compatible_configs.md -max-line-length = 88 - # max cyclomatic complexity max-complexity = 9 extend-ignore = - # ignore E203 because black might reformat it + # defer formatting concerns to black + # E203: space around `:` operator + # E501: maximum line length E203, + E501, # do not require type annotations for self nor cls ANN101, ANN102 diff --git a/api/setup.py b/api/setup.py index c863b6b5ab4..0bcd3e9b11d 100755 --- a/api/setup.py +++ b/api/setup.py @@ -106,7 +106,7 @@ def read(*parts): }, project_urls={ "opentrons.com": "https://www.opentrons.com", - "Source Code On Github": "https://github.com/Opentrons/opentrons/tree/edge/api", # noqa: E501 + "Source Code On Github": "https://github.com/Opentrons/opentrons/tree/edge/api", "Documentation": "https://docs.opentrons.com", }, ) diff --git a/api/src/opentrons/calibration_storage/modify.py b/api/src/opentrons/calibration_storage/modify.py index 5de36794c66..a0dd45236d1 100644 --- a/api/src/opentrons/calibration_storage/modify.py +++ b/api/src/opentrons/calibration_storage/modify.py @@ -117,7 +117,7 @@ def create_tip_length_data( status = cal_status else: status = local_types.CalibrationStatus() - status_dict: "CalibrationStatusDict" = helpers.convert_to_dict( # type: ignore[assignment] # noqa: E501 + status_dict: "CalibrationStatusDict" = helpers.convert_to_dict( # type: ignore[assignment] status ) @@ -223,7 +223,7 @@ def save_robot_deck_attitude( status = cal_status else: status = local_types.CalibrationStatus() - status_dict: "CalibrationStatusDict" = helpers.convert_to_dict( # type: ignore[assignment] # noqa: E501 + status_dict: "CalibrationStatusDict" = helpers.convert_to_dict( # type: ignore[assignment] status ) @@ -268,7 +268,7 @@ def save_pipette_calibration( status = cal_status else: status = local_types.CalibrationStatus() - status_dict: "CalibrationStatusDict" = helpers.convert_to_dict( # type: ignore[assignment] # noqa: E501 + status_dict: "CalibrationStatusDict" = helpers.convert_to_dict( # type: ignore[assignment] status ) offset_path = pip_dir / f"{pip_id}.json" @@ -296,7 +296,7 @@ def save_gripper_calibration( status = cal_status else: status = local_types.CalibrationStatus() - status_dict: "CalibrationStatusDict" = helpers.convert_to_dict( # type: ignore[assignment] # noqa: E501 + status_dict: "CalibrationStatusDict" = helpers.convert_to_dict( # type: ignore[assignment] status ) diff --git a/api/src/opentrons/drivers/smoothie_drivers/driver_3_0.py b/api/src/opentrons/drivers/smoothie_drivers/driver_3_0.py index 8dd05023d92..9d4386f006a 100755 --- a/api/src/opentrons/drivers/smoothie_drivers/driver_3_0.py +++ b/api/src/opentrons/drivers/smoothie_drivers/driver_3_0.py @@ -1305,7 +1305,7 @@ def build_split(here: float, dest: float, split_distance: float) -> float: # - we have a split configuration and split # - it's been long enough since the last time it moved - and ((since_moved[ax] is None) or (split.after_time < since_moved[ax])) # type: ignore[operator] # noqa: E501 + and ((since_moved[ax] is None) or (split.after_time < since_moved[ax])) # type: ignore[operator] } split_command_string = create_coords_list(split_target) diff --git a/api/src/opentrons/protocol_api/instrument_context.py b/api/src/opentrons/protocol_api/instrument_context.py index 08b3fd89d5e..2f8f314c041 100644 --- a/api/src/opentrons/protocol_api/instrument_context.py +++ b/api/src/opentrons/protocol_api/instrument_context.py @@ -167,7 +167,7 @@ def aspirate( a location, specify it as a keyword argument: ``instr.aspirate(location=wellplate['A1'])`` - """ # noqa: E501 + """ logger.debug( "aspirate {} from {} at {}".format( volume, location if location else "current position", rate @@ -282,7 +282,7 @@ def dispense( a location, specify it as a keyword argument: ``instr.dispense(location=wellplate['A1'])`` - """ # noqa: E501 + """ logger.debug( "dispense {} from {} at {}".format( volume, location if location else "current position", rate @@ -1210,7 +1210,7 @@ def move_to( broker=self.broker, command=cmds.move_to( instrument=self, - location=location or self._ctx.location_cache, # type: ignore[arg-type] # noqa: E501 + location=location or self._ctx.location_cache, # type: ignore[arg-type] ), ) diff --git a/api/src/opentrons/protocol_api/labware.py b/api/src/opentrons/protocol_api/labware.py index 789c82df79d..abd6eff1a14 100644 --- a/api/src/opentrons/protocol_api/labware.py +++ b/api/src/opentrons/protocol_api/labware.py @@ -397,7 +397,7 @@ def wells(self, *args: Union[str, int]) -> List[Well]: if not args: res = self._implementation.get_wells() elif isinstance(args[0], int): - res = [self._implementation.get_wells()[idx] for idx in args] # type: ignore[index] # noqa: E501 + res = [self._implementation.get_wells()[idx] for idx in args] # type: ignore[index] elif isinstance(args[0], str): by_name = self._implementation.get_wells_by_name() res = [by_name[idx] for idx in args] # type: ignore[index] diff --git a/api/src/opentrons/protocol_engine/execution/command_executor.py b/api/src/opentrons/protocol_engine/execution/command_executor.py index 4bf76792a67..bab074b89b1 100644 --- a/api/src/opentrons/protocol_engine/execution/command_executor.py +++ b/api/src/opentrons/protocol_engine/execution/command_executor.py @@ -81,7 +81,7 @@ async def execute(self, command_id: str) -> None: log.debug( f"Executing {command.id}, {command.commandType}, {command.params}" ) - result = await command_impl.execute(command.params) # type: ignore[arg-type] # noqa: E501 + result = await command_impl.execute(command.params) # type: ignore[arg-type] except Exception as error: log.warning(f"Execution of {command.id} failed", exc_info=error) diff --git a/api/src/opentrons/protocol_reader/file_reader_writer.py b/api/src/opentrons/protocol_reader/file_reader_writer.py index 75f2ff90f29..a921bf7f22a 100644 --- a/api/src/opentrons/protocol_reader/file_reader_writer.py +++ b/api/src/opentrons/protocol_reader/file_reader_writer.py @@ -63,7 +63,7 @@ async def _read_file( if filename.lower().endswith(".json"): try: - data = parse_raw_as(BufferedJsonFileData, contents) # type: ignore[arg-type] # noqa: E501 + data = parse_raw_as(BufferedJsonFileData, contents) # type: ignore[arg-type] # unlike other Pydantic functions/methods, `parse_raw_as` can # raise both JSONDecodeError and ValidationError separately diff --git a/api/src/opentrons/protocol_runner/legacy_command_mapper.py b/api/src/opentrons/protocol_runner/legacy_command_mapper.py index 2d3f6399c6c..cb76ae2ae46 100644 --- a/api/src/opentrons/protocol_runner/legacy_command_mapper.py +++ b/api/src/opentrons/protocol_runner/legacy_command_mapper.py @@ -44,10 +44,10 @@ class LegacyContextCommandError(ProtocolEngineError): _LEGACY_TO_PE_MODULE: Dict[LegacyModuleModel, pe_types.ModuleModel] = { LegacyMagneticModuleModel.MAGNETIC_V1: pe_types.ModuleModel.MAGNETIC_MODULE_V1, LegacyMagneticModuleModel.MAGNETIC_V2: pe_types.ModuleModel.MAGNETIC_MODULE_V2, - LegacyTemperatureModuleModel.TEMPERATURE_V1: pe_types.ModuleModel.TEMPERATURE_MODULE_V1, # noqa: E501 - LegacyTemperatureModuleModel.TEMPERATURE_V2: pe_types.ModuleModel.TEMPERATURE_MODULE_V2, # noqa: E501 - LegacyThermocyclerModuleModel.THERMOCYCLER_V1: pe_types.ModuleModel.THERMOCYCLER_MODULE_V1, # noqa: E501 - LegacyThermocyclerModuleModel.THERMOCYCLER_V2: pe_types.ModuleModel.THERMOCYCLER_MODULE_V2, # noqa: E501 + LegacyTemperatureModuleModel.TEMPERATURE_V1: pe_types.ModuleModel.TEMPERATURE_MODULE_V1, + LegacyTemperatureModuleModel.TEMPERATURE_V2: pe_types.ModuleModel.TEMPERATURE_MODULE_V2, + LegacyThermocyclerModuleModel.THERMOCYCLER_V1: pe_types.ModuleModel.THERMOCYCLER_MODULE_V1, + LegacyThermocyclerModuleModel.THERMOCYCLER_V2: pe_types.ModuleModel.THERMOCYCLER_MODULE_V2, } _HIGHER_ORDER_COMMAND_TYPES = { @@ -203,7 +203,7 @@ def _build_initial_command( else: raise Exception("Unknown pick_up_tip location.") mount = MountType(pipette.mount) - slot = DeckSlotName.from_primitive(well.parent.parent) # type: ignore[arg-type] # noqa: E501 + slot = DeckSlotName.from_primitive(well.parent.parent) # type: ignore[arg-type] well_name = well.well_name labware_id = self._labware_id_by_slot[slot] pipette_id = self._pipette_id_by_mount[mount] @@ -225,14 +225,14 @@ def _build_initial_command( and "instrument" in command["payload"] and "location" in command["payload"] ): - pipette: LegacyPipetteContext = command["payload"]["instrument"] # type: ignore # noqa: E501 + pipette: LegacyPipetteContext = command["payload"]["instrument"] # type: ignore location = command["payload"].get("location") if isinstance(location, Location): well = location.labware.as_well() else: raise Exception("Unknown drop_tip location.") mount = MountType(pipette.mount) - slot = DeckSlotName.from_primitive(well.parent.parent) # type: ignore[arg-type] # noqa: E501 + slot = DeckSlotName.from_primitive(well.parent.parent) # type: ignore[arg-type] well_name = well.well_name labware_id = self._labware_id_by_slot[slot] pipette_id = self._pipette_id_by_mount[mount] diff --git a/api/src/opentrons/protocols/api_support/instrument.py b/api/src/opentrons/protocols/api_support/instrument.py index b2e09556c5c..9a7c65aa2f4 100644 --- a/api/src/opentrons/protocols/api_support/instrument.py +++ b/api/src/opentrons/protocols/api_support/instrument.py @@ -149,4 +149,4 @@ def validate_can_dispense(location: types.Location) -> None: # things a `types.Location` can be (i.e. module, labware, well, etc.) def _is_tiprack(location: types.Location) -> bool: labware = location.labware.as_labware() - return labware.parent and labware.parent.is_tiprack # type: ignore[return-value, union-attr] # noqa: E501 + return labware.parent and labware.parent.is_tiprack # type: ignore[return-value, union-attr] diff --git a/api/src/opentrons/protocols/context/protocol_api/protocol_context.py b/api/src/opentrons/protocols/context/protocol_api/protocol_context.py index c3f8eaae05a..0a0ef5c7eb6 100644 --- a/api/src/opentrons/protocols/context/protocol_api/protocol_context.py +++ b/api/src/opentrons/protocols/context/protocol_api/protocol_context.py @@ -199,7 +199,7 @@ def load_instrument( attached = { att_mount: instr.get("name", None) - for att_mount, instr in self._sync_hardware.attached_instruments.items() # noqa: E501 + for att_mount, instr in self._sync_hardware.attached_instruments.items() if instr } attached[mount] = instrument_name diff --git a/api/src/opentrons/protocols/context/simulator/protocol_context.py b/api/src/opentrons/protocols/context/simulator/protocol_context.py index 871612d8065..ee2fe99f9fc 100644 --- a/api/src/opentrons/protocols/context/simulator/protocol_context.py +++ b/api/src/opentrons/protocols/context/simulator/protocol_context.py @@ -34,7 +34,7 @@ def load_instrument( attached = { att_mount: instr.get("name", None) - for att_mount, instr in self._sync_hardware.attached_instruments.items() # noqa: E501 + for att_mount, instr in self._sync_hardware.attached_instruments.items() if instr } attached[mount] = instrument_name diff --git a/api/src/opentrons/protocols/execution/json_dispatchers.py b/api/src/opentrons/protocols/execution/json_dispatchers.py index 3f8240fceab..a48bba1f97a 100644 --- a/api/src/opentrons/protocols/execution/json_dispatchers.py +++ b/api/src/opentrons/protocols/execution/json_dispatchers.py @@ -60,9 +60,9 @@ } temperature_module_command_map: "JsonV4TemperatureModuleDispatch" = { - JsonTemperatureModuleCommand.temperatureModuleSetTargetTemperature.value: _temperature_module_set_temp, # noqa: E501 - JsonTemperatureModuleCommand.temperatureModuleDeactivate.value: _temperature_module_deactivate, # noqa: E501 - JsonTemperatureModuleCommand.temperatureModuleAwaitTemperature.value: _temperature_module_await_temp, # noqa: E501 + JsonTemperatureModuleCommand.temperatureModuleSetTargetTemperature.value: _temperature_module_set_temp, + JsonTemperatureModuleCommand.temperatureModuleDeactivate.value: _temperature_module_deactivate, + JsonTemperatureModuleCommand.temperatureModuleAwaitTemperature.value: _temperature_module_await_temp, } @@ -73,10 +73,10 @@ def tc_do_nothing(module: ThermocyclerContext, params) -> None: thermocycler_module_command_map: "JsonV4ThermocyclerDispatch" = { JsonThermocyclerCommand.thermocyclerCloseLid.value: _thermocycler_close_lid, JsonThermocyclerCommand.thermocyclerOpenLid.value: _thermocycler_open_lid, - JsonThermocyclerCommand.thermocyclerDeactivateBlock.value: _thermocycler_deactivate_block, # noqa: E501 - JsonThermocyclerCommand.thermocyclerDeactivateLid.value: _thermocycler_deactivate_lid, # noqa: E501 - JsonThermocyclerCommand.thermocyclerSetTargetBlockTemperature.value: _thermocycler_set_block_temperature, # noqa: E501 - JsonThermocyclerCommand.thermocyclerSetTargetLidTemperature.value: _thermocycler_set_lid_temperature, # noqa: E501 + JsonThermocyclerCommand.thermocyclerDeactivateBlock.value: _thermocycler_deactivate_block, + JsonThermocyclerCommand.thermocyclerDeactivateLid.value: _thermocycler_deactivate_lid, + JsonThermocyclerCommand.thermocyclerSetTargetBlockTemperature.value: _thermocycler_set_block_temperature, + JsonThermocyclerCommand.thermocyclerSetTargetLidTemperature.value: _thermocycler_set_lid_temperature, JsonThermocyclerCommand.thermocyclerRunProfile.value: _thermocycler_run_profile, # NOTE: the thermocyclerAwaitX commands are expected to always # follow a corresponding SetX command, which is implemented as diff --git a/api/src/opentrons/protocols/models/json_protocol.py b/api/src/opentrons/protocols/models/json_protocol.py index 2f8a012d2af..c600f03ca8c 100644 --- a/api/src/opentrons/protocols/models/json_protocol.py +++ b/api/src/opentrons/protocols/models/json_protocol.py @@ -46,10 +46,10 @@ CommandThermocyclerSetTargetLid: dev_types.ThermocyclerSetTargetLidCommandId = ( "thermocycler/setTargetLidTemperature" ) -CommandThermocyclerAwaitLidTemperature: dev_types.ThermocyclerAwaitLidTemperatureCommandId = ( # noqa: E501 +CommandThermocyclerAwaitLidTemperature: dev_types.ThermocyclerAwaitLidTemperatureCommandId = ( "thermocycler/awaitLidTemperature" ) -CommandThermocyclerAwaitBlockTemperature: dev_types.ThermocyclerAwaitBlockTemperatureCommandId = ( # noqa: E501 +CommandThermocyclerAwaitBlockTemperature: dev_types.ThermocyclerAwaitBlockTemperatureCommandId = ( "thermocycler/awaitBlockTemperature" ) CommandThermocyclerDeactivateBlock: dev_types.ThermocyclerDeactivateBlockCommandId = ( diff --git a/api/src/opentrons/protocols/types.py b/api/src/opentrons/protocols/types.py index 8488e7ee644..cc871b376dd 100644 --- a/api/src/opentrons/protocols/types.py +++ b/api/src/opentrons/protocols/types.py @@ -78,7 +78,7 @@ def run(ctx): Please contact support@opentrons.com to retrieve the previous software version and be guided through the downgrade process. -""" # noqa: E501 +""" class MalformedProtocolError(Exception): diff --git a/api/src/opentrons/simulate.py b/api/src/opentrons/simulate.py index 20df636084a..2b4b747da41 100644 --- a/api/src/opentrons/simulate.py +++ b/api/src/opentrons/simulate.py @@ -585,7 +585,7 @@ def main() -> int: args = parser.parse_args() # Try to migrate api v1 containers if needed - duration_estimator = DurationEstimator() if args.estimate_duration else None # type: ignore[no-untyped-call] # noqa: E501 + duration_estimator = DurationEstimator() if args.estimate_duration else None # type: ignore[no-untyped-call] runlog, maybe_bundle = simulate( args.protocol, diff --git a/api/src/opentrons/system/camera.py b/api/src/opentrons/system/camera.py index ce862ac7477..3cb609b3266 100644 --- a/api/src/opentrons/system/camera.py +++ b/api/src/opentrons/system/camera.py @@ -25,7 +25,7 @@ async def take_picture(filename: Path) -> None: if IS_OSX: # Purely for development on macos - cmd = 'ffmpeg -f avfoundation -framerate 1 -s 640x480 -i "0" -ss 0:0:1 -frames 1' # noqa: E501 + cmd = 'ffmpeg -f avfoundation -framerate 1 -s 640x480 -i "0" -ss 0:0:1 -frames 1' proc = await asyncio.create_subprocess_shell( f"{cmd} {filename}", diff --git a/api/src/opentrons/util/linal.py b/api/src/opentrons/util/linal.py index 5b161f41af4..58b293342b1 100644 --- a/api/src/opentrons/util/linal.py +++ b/api/src/opentrons/util/linal.py @@ -38,7 +38,7 @@ def solve_attitude(expected: SolvePoints, actual: SolvePoints) -> AttitudeMatrix mask_transform = np.array( [[True, True, False], [True, True, False], [False, False, False]] ) - masked_array = np.ma.masked_array(t, ~mask_transform) # type: ignore[var-annotated, no-untyped-call] # noqa: E501 + masked_array = np.ma.masked_array(t, ~mask_transform) # type: ignore[var-annotated, no-untyped-call] no_z_component = np.zeros((3, 3)) np.put(no_z_component, [8, 8], 1) diff --git a/api/tests/opentrons/drivers/rpi_drivers/test_usb.py b/api/tests/opentrons/drivers/rpi_drivers/test_usb.py index 99d48f1fd9b..dd5ec92c103 100644 --- a/api/tests/opentrons/drivers/rpi_drivers/test_usb.py +++ b/api/tests/opentrons/drivers/rpi_drivers/test_usb.py @@ -17,7 +17,7 @@ "/sys/bus/usb/devices/usb1/1-1/1-1.1/dev", "/sys/bus/usb/devices/usb1/1-1/dev", "/sys/bus/usb/devices/usb1/1-1/1-1.5/dev", - "/sys/bus/usb/devices/usb1/1-1/1-1.5/1-1.5:1.2/0003:046D:C52B.0017/hidraw/hidraw0/dev", # noqa: E501 + "/sys/bus/usb/devices/usb1/1-1/1-1.5/1-1.5:1.2/0003:046D:C52B.0017/hidraw/hidraw0/dev", "/sys/bus/usb/devices/usb1/1-1/1-1.5/1-1.5:1.2/usbmisc/hiddev0/dev", ] @@ -57,7 +57,7 @@ def test_modify_module_list(revision: BoardRevision, usb_bus: USBBus): # TODO(mc, 2022-03-01): partial patching the class under test creates # a contaminated test subject that reduces the value of these tests # https://github.com/testdouble/contributing-tests/wiki/Partial-Mock - usb_bus._read_symlink = MagicMock(return_value="ttyACM1") # type: ignore[assignment] # noqa: E501 + usb_bus._read_symlink = MagicMock(return_value="ttyACM1") # type: ignore[assignment] mod_at_port_list = [ ModuleAtPort(name="temperature module", port="dev/ot_module_temperature_module") ] @@ -73,7 +73,7 @@ def test_modify_module_list(revision: BoardRevision, usb_bus: USBBus): # TODO(mc, 2022-03-01): figure out why this section of the test doesn't # work on using the OT-2R mocked port values if revision == BoardRevision.OG: - usb_bus._read_symlink = MagicMock(return_value="ttyACM2") # type: ignore[assignment] # noqa: E501 + usb_bus._read_symlink = MagicMock(return_value="ttyACM2") # type: ignore[assignment] mod_at_port_list = [ ModuleAtPort(name="magnetic module", port="dev/ot_module_magnetic_module") ] diff --git a/api/tests/opentrons/drivers/smoothie_drivers/test_connection.py b/api/tests/opentrons/drivers/smoothie_drivers/test_connection.py index b0fd200c300..b483006041c 100644 --- a/api/tests/opentrons/drivers/smoothie_drivers/test_connection.py +++ b/api/tests/opentrons/drivers/smoothie_drivers/test_connection.py @@ -78,7 +78,7 @@ async def test_command_sender_sanitized_response( ["M3 R \r\n\r\n", "M3R:703130", "R:703130"], [ "M369 L \r\n\r\n", - "M369 L \r\n\r\nL:5032304D56323032303230303432323036000000000000000000000000000000", # noqa: E501 + "M369 L \r\n\r\nL:5032304D56323032303230303432323036000000000000000000000000000000", "L:5032304D56323032303230303432323036000000000000000000000000000000", ], ], diff --git a/api/tests/opentrons/hardware_control/modules/test_hc_thermocycler.py b/api/tests/opentrons/hardware_control/modules/test_hc_thermocycler.py index e79e824e3af..0fa676e862b 100644 --- a/api/tests/opentrons/hardware_control/modules/test_hc_thermocycler.py +++ b/api/tests/opentrons/hardware_control/modules/test_hc_thermocycler.py @@ -200,7 +200,7 @@ async def test_set_temperature_fuzzy( # Test hold_time < _hold_time_fuzzy_seconds. Here we know # that wait_for_hold will be called with the direct hold # time rather than increments of 0.1 - set_temperature_subject._wait_for_hold = mock.AsyncMock() # type: ignore[assignment] # noqa: E501 + set_temperature_subject._wait_for_hold = mock.AsyncMock() # type: ignore[assignment] await set_temperature_subject.set_temperature(40, hold_time_seconds=2) set_temperature_subject._wait_for_hold.assert_called_once_with(2) set_plate_temp_spy.assert_called_once_with(temp=40, hold_time=2, volume=None) diff --git a/api/tests/opentrons/protocol_api/test_labware.py b/api/tests/opentrons/protocol_api/test_labware.py index a3b85e52c4c..d13ed6bcbc2 100644 --- a/api/tests/opentrons/protocol_api/test_labware.py +++ b/api/tests/opentrons/protocol_api/test_labware.py @@ -82,7 +82,7 @@ def test_well_init() -> None: name="A1", ), ) - assert well1.geometry.diameter == test_data[well_name]["diameter"] # type: ignore[typeddict-item] # noqa: E501 + assert well1.geometry.diameter == test_data[well_name]["diameter"] # type: ignore[typeddict-item] assert well1.geometry._length is None assert well1.geometry._width is None @@ -101,8 +101,8 @@ def test_well_init() -> None: ), ) assert well2.geometry.diameter is None - assert well2.geometry._length == test_data[well2_name]["xDimension"] # type: ignore[typeddict-item] # noqa: E501 - assert well2.geometry._width == test_data[well2_name]["yDimension"] # type: ignore[typeddict-item] # noqa: E501 + assert well2.geometry._length == test_data[well2_name]["xDimension"] # type: ignore[typeddict-item] + assert well2.geometry._width == test_data[well2_name]["yDimension"] # type: ignore[typeddict-item] def test_top() -> None: diff --git a/api/tests/opentrons/protocol_api/test_offsets.py b/api/tests/opentrons/protocol_api/test_offsets.py index f22021003f9..58e1fe2129f 100644 --- a/api/tests/opentrons/protocol_api/test_offsets.py +++ b/api/tests/opentrons/protocol_api/test_offsets.py @@ -122,7 +122,7 @@ def test_save_labware_calibration(monkeypatch, clear_calibration): # Test the save calibration file assert not os.path.exists(path(MOCK_HASH)) - impl = LabwareImplementation(minimalLabwareDef, Location(Point(0, 0, 0), "deck")) # type: ignore[arg-type] # noqa: E501 + impl = LabwareImplementation(minimalLabwareDef, Location(Point(0, 0, 0), "deck")) # type: ignore[arg-type] impl.set_calibration = Mock() # type: ignore[assignment] monkeypatch.setattr(helpers, "hash_labware_def", mock_hash_labware) @@ -163,7 +163,7 @@ def test_create_tip_length_calibration_data(monkeypatch, clear_custom_tiprack_di } } assert not os.path.exists(custom_tiprack_path(URI)) - result = modify.create_tip_length_data(minimalLabwareDef, tip_length) # type: ignore[arg-type] # noqa: E501 + result = modify.create_tip_length_data(minimalLabwareDef, tip_length) # type: ignore[arg-type] assert result == expected_data assert os.path.exists(custom_tiprack_path(URI)) @@ -201,7 +201,7 @@ def test_load_nonexistent_tip_length_calibration_data( # file does not exist (FileNotFoundError) with pytest.raises(cs_types.TipLengthCalNotFound): - get.load_tip_length_calibration(PIPETTE_ID, minimalLabwareDef) # type: ignore[arg-type] # noqa: E501 + get.load_tip_length_calibration(PIPETTE_ID, minimalLabwareDef) # type: ignore[arg-type] # labware hash not in calibration file (KeyError) calpath = config.get_tip_length_cal_path() @@ -209,7 +209,7 @@ def test_load_nonexistent_tip_length_calibration_data( test_offset = {"FAKE_HASH": {"tipLength": 22.0, "lastModified": 1}} json.dump(test_offset, offset_file) with pytest.raises(cs_types.TipLengthCalNotFound): - get.load_tip_length_calibration(PIPETTE_ID, minimalLabwareDef) # type: ignore[arg-type] # noqa: E501 + get.load_tip_length_calibration(PIPETTE_ID, minimalLabwareDef) # type: ignore[arg-type] def test_load_tip_length_calibration_data(monkeypatch, clear_tlc_calibration): @@ -218,9 +218,9 @@ def test_load_tip_length_calibration_data(monkeypatch, clear_tlc_calibration): monkeypatch.setattr(helpers, "hash_labware_def", mock_hash_labware) tip_length = 22.0 - test_data = modify.create_tip_length_data(minimalLabwareDef, tip_length) # type: ignore[arg-type] # noqa: E501 + test_data = modify.create_tip_length_data(minimalLabwareDef, tip_length) # type: ignore[arg-type] modify.save_tip_length_calibration(PIPETTE_ID, test_data) - result = get.load_tip_length_calibration(PIPETTE_ID, minimalLabwareDef) # type: ignore[arg-type] # noqa: E501 + result = get.load_tip_length_calibration(PIPETTE_ID, minimalLabwareDef) # type: ignore[arg-type] expected = cs_types.TipLengthCalibration( tip_length=tip_length, pipette=PIPETTE_ID, @@ -262,7 +262,7 @@ def isoformat(cls): mock.__class__ = datetime.datetime # type: ignore[assignment] test_labware = labware.Labware( - LabwareImplementation(minimalLabwareDef, Location(Point(0, 0, 0), "deck")) # type: ignore[arg-type] # noqa: E501 + LabwareImplementation(minimalLabwareDef, Location(Point(0, 0, 0), "deck")) # type: ignore[arg-type] ) monkeypatch.setattr(helpers, "hash_labware_def", mock_hash_labware) @@ -285,7 +285,7 @@ def test_load_calibration(monkeypatch, clear_calibration): monkeypatch.setattr(helpers, "hash_labware_def", mock_hash_labware) test_labware = labware.Labware( - LabwareImplementation(minimalLabwareDef, Location(Point(0, 0, 0), "deck")) # type: ignore[arg-type] # noqa: E501 + LabwareImplementation(minimalLabwareDef, Location(Point(0, 0, 0), "deck")) # type: ignore[arg-type] ) test_offset = Point(1, 1, 1) @@ -306,7 +306,7 @@ def test_load_calibration(monkeypatch, clear_calibration): def test_wells_rebuilt_with_offset(): test_labware = labware.Labware( implementation=LabwareImplementation( - minimalLabwareDef, Location(Point(0, 0, 0), "deck") # type: ignore[arg-type] # noqa: E501 + minimalLabwareDef, Location(Point(0, 0, 0), "deck") # type: ignore[arg-type] ) ) old_wells = test_labware.wells() @@ -340,12 +340,12 @@ def testhash_labware_def(): def2 = {"metadata": {"a": 123}, "importantStuff": [1.1, 0.000033, 1 / 3]} # identity preserved across json serialization+deserialization - assert helpers.hash_labware_def(def1a) == helpers.hash_labware_def( # type: ignore[arg-type] # noqa: E501 + assert helpers.hash_labware_def(def1a) == helpers.hash_labware_def( # type: ignore[arg-type] json.loads(json.dumps(def1a, separators=(",", ":"))) ) # 2 instances of same def should match - assert helpers.hash_labware_def(def1a) == helpers.hash_labware_def(def1aa) # type: ignore[arg-type] # noqa: E501 + assert helpers.hash_labware_def(def1a) == helpers.hash_labware_def(def1aa) # type: ignore[arg-type] # metadata ignored - assert helpers.hash_labware_def(def1a) == helpers.hash_labware_def(def1b) # type: ignore[arg-type] # noqa: E501 + assert helpers.hash_labware_def(def1a) == helpers.hash_labware_def(def1b) # type: ignore[arg-type] # different data should not match - assert helpers.hash_labware_def(def1a) != helpers.hash_labware_def(def2) # type: ignore[arg-type] # noqa: E501 + assert helpers.hash_labware_def(def1a) != helpers.hash_labware_def(def2) # type: ignore[arg-type] diff --git a/api/tests/opentrons/protocol_api_experimental/module_contexts/test_magnetic_module_context.py b/api/tests/opentrons/protocol_api_experimental/module_contexts/test_magnetic_module_context.py index 817596b0e8c..e71ef6dd4e7 100644 --- a/api/tests/opentrons/protocol_api_experimental/module_contexts/test_magnetic_module_context.py +++ b/api/tests/opentrons/protocol_api_experimental/module_contexts/test_magnetic_module_context.py @@ -128,7 +128,7 @@ def test_engage_only_one_height_allowed(subject: MagneticModuleContext) -> None: # itself when there is no type-checker. with pytest.raises(InvalidMagnetEngageHeightError): - subject.engage(height=1, height_from_base=2, offset=3) # type: ignore[call-overload] # noqa: E501 + subject.engage(height=1, height_from_base=2, offset=3) # type: ignore[call-overload] with pytest.raises(InvalidMagnetEngageHeightError): subject.engage(height=1, height_from_base=2) # type: ignore[call-overload] with pytest.raises(InvalidMagnetEngageHeightError): diff --git a/api/tests/opentrons/protocol_engine/commands/heater_shaker/test_set_and_wait_for_shake_speed.py b/api/tests/opentrons/protocol_engine/commands/heater_shaker/test_set_and_wait_for_shake_speed.py index b3f0caa8cb6..432c8bf46b0 100644 --- a/api/tests/opentrons/protocol_engine/commands/heater_shaker/test_set_and_wait_for_shake_speed.py +++ b/api/tests/opentrons/protocol_engine/commands/heater_shaker/test_set_and_wait_for_shake_speed.py @@ -10,7 +10,7 @@ ) from opentrons.protocol_engine.execution import EquipmentHandler from opentrons.protocol_engine.commands import heater_shaker -from opentrons.protocol_engine.commands.heater_shaker.set_and_wait_for_shake_speed import ( # noqa: E501 +from opentrons.protocol_engine.commands.heater_shaker.set_and_wait_for_shake_speed import ( SetAndWaitForShakeSpeedImpl, ) diff --git a/api/tests/opentrons/protocol_engine/commands/heater_shaker/test_set_target_temperature.py b/api/tests/opentrons/protocol_engine/commands/heater_shaker/test_set_target_temperature.py index 8d932f964df..0004a6da7ab 100644 --- a/api/tests/opentrons/protocol_engine/commands/heater_shaker/test_set_target_temperature.py +++ b/api/tests/opentrons/protocol_engine/commands/heater_shaker/test_set_target_temperature.py @@ -10,7 +10,7 @@ ) from opentrons.protocol_engine.execution import EquipmentHandler from opentrons.protocol_engine.commands import heater_shaker -from opentrons.protocol_engine.commands.heater_shaker.set_target_temperature import ( # noqa: E501 +from opentrons.protocol_engine.commands.heater_shaker.set_target_temperature import ( SetTargetTemperatureImpl, ) diff --git a/api/tests/opentrons/protocol_engine/commands/temperature_module/test_deactivate.py b/api/tests/opentrons/protocol_engine/commands/temperature_module/test_deactivate.py index 250ee605776..0aa28cf525c 100644 --- a/api/tests/opentrons/protocol_engine/commands/temperature_module/test_deactivate.py +++ b/api/tests/opentrons/protocol_engine/commands/temperature_module/test_deactivate.py @@ -10,7 +10,7 @@ ) from opentrons.protocol_engine.execution import EquipmentHandler from opentrons.protocol_engine.commands import temperature_module -from opentrons.protocol_engine.commands.temperature_module.deactivate import ( # noqa: E501 +from opentrons.protocol_engine.commands.temperature_module.deactivate import ( DeactivateTemperatureImpl, ) diff --git a/api/tests/opentrons/protocol_engine/commands/temperature_module/test_set_target_temperature.py b/api/tests/opentrons/protocol_engine/commands/temperature_module/test_set_target_temperature.py index 6a99d221abb..e3f137e2166 100644 --- a/api/tests/opentrons/protocol_engine/commands/temperature_module/test_set_target_temperature.py +++ b/api/tests/opentrons/protocol_engine/commands/temperature_module/test_set_target_temperature.py @@ -10,7 +10,7 @@ ) from opentrons.protocol_engine.execution import EquipmentHandler from opentrons.protocol_engine.commands import temperature_module -from opentrons.protocol_engine.commands.temperature_module.set_target_temperature import ( # noqa: E501 +from opentrons.protocol_engine.commands.temperature_module.set_target_temperature import ( SetTargetTemperatureImpl, ) diff --git a/api/tests/opentrons/protocol_engine/commands/temperature_module/test_wait_for_temperature.py b/api/tests/opentrons/protocol_engine/commands/temperature_module/test_wait_for_temperature.py index 93482408200..7a1a423d906 100644 --- a/api/tests/opentrons/protocol_engine/commands/temperature_module/test_wait_for_temperature.py +++ b/api/tests/opentrons/protocol_engine/commands/temperature_module/test_wait_for_temperature.py @@ -10,7 +10,7 @@ ) from opentrons.protocol_engine.execution import EquipmentHandler from opentrons.protocol_engine.commands import temperature_module -from opentrons.protocol_engine.commands.temperature_module.wait_for_temperature import ( # noqa: E501 +from opentrons.protocol_engine.commands.temperature_module.wait_for_temperature import ( WaitForTemperatureImpl, ) diff --git a/api/tests/opentrons/protocol_engine/commands/thermocycler/test_set_target_block_temperature.py b/api/tests/opentrons/protocol_engine/commands/thermocycler/test_set_target_block_temperature.py index 62b3f5bc929..35a3d6654ac 100644 --- a/api/tests/opentrons/protocol_engine/commands/thermocycler/test_set_target_block_temperature.py +++ b/api/tests/opentrons/protocol_engine/commands/thermocycler/test_set_target_block_temperature.py @@ -10,7 +10,7 @@ ) from opentrons.protocol_engine.execution import EquipmentHandler from opentrons.protocol_engine.commands import thermocycler as tc_commands -from opentrons.protocol_engine.commands.thermocycler.set_target_block_temperature import ( # noqa: E501 +from opentrons.protocol_engine.commands.thermocycler.set_target_block_temperature import ( SetTargetBlockTemperatureImpl, ) diff --git a/api/tests/opentrons/protocol_engine/commands/thermocycler/test_set_target_lid_temperature.py b/api/tests/opentrons/protocol_engine/commands/thermocycler/test_set_target_lid_temperature.py index 05241bbbe16..7d6201c65d5 100644 --- a/api/tests/opentrons/protocol_engine/commands/thermocycler/test_set_target_lid_temperature.py +++ b/api/tests/opentrons/protocol_engine/commands/thermocycler/test_set_target_lid_temperature.py @@ -10,7 +10,7 @@ ) from opentrons.protocol_engine.execution import EquipmentHandler from opentrons.protocol_engine.commands import thermocycler as tc_commands -from opentrons.protocol_engine.commands.thermocycler.set_target_lid_temperature import ( # noqa: E501 +from opentrons.protocol_engine.commands.thermocycler.set_target_lid_temperature import ( SetTargetLidTemperatureImpl, ) diff --git a/api/tests/opentrons/protocol_engine/commands/thermocycler/test_wait_for_block_temperature.py b/api/tests/opentrons/protocol_engine/commands/thermocycler/test_wait_for_block_temperature.py index 192709b91d7..269200f1266 100644 --- a/api/tests/opentrons/protocol_engine/commands/thermocycler/test_wait_for_block_temperature.py +++ b/api/tests/opentrons/protocol_engine/commands/thermocycler/test_wait_for_block_temperature.py @@ -10,7 +10,7 @@ ) from opentrons.protocol_engine.execution import EquipmentHandler from opentrons.protocol_engine.commands import thermocycler as tc_commands -from opentrons.protocol_engine.commands.thermocycler.wait_for_block_temperature import ( # noqa: E501 +from opentrons.protocol_engine.commands.thermocycler.wait_for_block_temperature import ( WaitForBlockTemperatureImpl, ) diff --git a/api/tests/opentrons/protocol_engine/commands/thermocycler/test_wait_for_lid_temperature.py b/api/tests/opentrons/protocol_engine/commands/thermocycler/test_wait_for_lid_temperature.py index 332173a7758..69ebf7e54c4 100644 --- a/api/tests/opentrons/protocol_engine/commands/thermocycler/test_wait_for_lid_temperature.py +++ b/api/tests/opentrons/protocol_engine/commands/thermocycler/test_wait_for_lid_temperature.py @@ -10,7 +10,7 @@ ) from opentrons.protocol_engine.execution import EquipmentHandler from opentrons.protocol_engine.commands import thermocycler as tc_commands -from opentrons.protocol_engine.commands.thermocycler.wait_for_lid_temperature import ( # noqa: E501 +from opentrons.protocol_engine.commands.thermocycler.wait_for_lid_temperature import ( WaitForLidTemperatureImpl, ) diff --git a/api/tests/opentrons/protocol_engine/state/test_module_store.py b/api/tests/opentrons/protocol_engine/state/test_module_store.py index f4307a396f7..19c5758ca70 100644 --- a/api/tests/opentrons/protocol_engine/state/test_module_store.py +++ b/api/tests/opentrons/protocol_engine/state/test_module_store.py @@ -193,7 +193,7 @@ def test_handle_hs_temperature_commands(heater_shaker_v1_def: ModuleDefinition) definition=heater_shaker_v1_def, ), ) - set_temp_cmd = hs_commands.SetTargetTemperature.construct( # type: ignore[call-arg] # noqa: E501 + set_temp_cmd = hs_commands.SetTargetTemperature.construct( # type: ignore[call-arg] params=hs_commands.SetTargetTemperatureParams(moduleId="module-id", celsius=42), result=hs_commands.SetTargetTemperatureResult(), ) @@ -234,13 +234,13 @@ def test_handle_tempdeck_temperature_commands( definition=tempdeck_v2_def, ), ) - set_temp_cmd = temp_commands.SetTargetTemperature.construct( # type: ignore[call-arg] # noqa: E501 + set_temp_cmd = temp_commands.SetTargetTemperature.construct( # type: ignore[call-arg] params=temp_commands.SetTargetTemperatureParams( moduleId="module-id", celsius=42.4 ), result=temp_commands.SetTargetTemperatureResult(targetTemperature=42), ) - deactivate_cmd = temp_commands.DeactivateTemperature.construct( # type: ignore[call-arg] # noqa: E501 + deactivate_cmd = temp_commands.DeactivateTemperature.construct( # type: ignore[call-arg] params=temp_commands.DeactivateTemperatureParams(moduleId="module-id"), result=temp_commands.DeactivateTemperatureResult(), ) @@ -277,23 +277,23 @@ def test_handle_thermocycler_block_temperature_commands( definition=thermocycler_v1_def, ), ) - set_block_temp_cmd = tc_commands.SetTargetBlockTemperature.construct( # type: ignore[call-arg] # noqa: E501 + set_block_temp_cmd = tc_commands.SetTargetBlockTemperature.construct( # type: ignore[call-arg] params=tc_commands.SetTargetBlockTemperatureParams( moduleId="module-id", celsius=42.4 ), result=tc_commands.SetTargetBlockTemperatureResult(targetBlockTemperature=42.4), ) - deactivate_block_cmd = tc_commands.DeactivateBlock.construct( # type: ignore[call-arg] # noqa: E501 + deactivate_block_cmd = tc_commands.DeactivateBlock.construct( # type: ignore[call-arg] params=tc_commands.DeactivateBlockParams(moduleId="module-id"), result=tc_commands.DeactivateBlockResult(), ) - set_lid_temp_cmd = tc_commands.SetTargetLidTemperature.construct( # type: ignore[call-arg] # noqa: E501 + set_lid_temp_cmd = tc_commands.SetTargetLidTemperature.construct( # type: ignore[call-arg] params=tc_commands.SetTargetLidTemperatureParams( moduleId="module-id", celsius=35.3 ), result=tc_commands.SetTargetLidTemperatureResult(targetLidTemperature=35.3), ) - deactivate_lid_cmd = tc_commands.DeactivateLid.construct( # type: ignore[call-arg] # noqa: E501 + deactivate_lid_cmd = tc_commands.DeactivateLid.construct( # type: ignore[call-arg] params=tc_commands.DeactivateLidParams(moduleId="module-id"), result=tc_commands.DeactivateLidResult(), ) diff --git a/api/tests/opentrons/protocols/execution/test_execute_json_v4.py b/api/tests/opentrons/protocols/execution/test_execute_json_v4.py index a747e9129a7..d0c88d3a1a6 100644 --- a/api/tests/opentrons/protocols/execution/test_execute_json_v4.py +++ b/api/tests/opentrons/protocols/execution/test_execute_json_v4.py @@ -70,9 +70,9 @@ def magnetic_module_command_map(mockObj): @pytest.fixture def temperature_module_command_map(mockObj): mock_temperature_module_command_map = { - JTMC.temperatureModuleSetTargetTemperature.value: mockObj._temperature_module_set_temp, # noqa: E501 + JTMC.temperatureModuleSetTargetTemperature.value: mockObj._temperature_module_set_temp, JTMC.temperatureModuleDeactivate.value: mockObj._temperature_module_deactivate, - JTMC.temperatureModuleAwaitTemperature.value: mockObj._temperature_module_await_temp, # noqa: E501 + JTMC.temperatureModuleAwaitTemperature.value: mockObj._temperature_module_await_temp, } return mock_temperature_module_command_map @@ -84,8 +84,8 @@ def thermocycler_module_command_map(mockObj): JTHC.thermocyclerOpenLid.value: mockObj._thermocycler_open_lid, JTHC.thermocyclerDeactivateBlock.value: mockObj._thermocycler_deactivate_block, JTHC.thermocyclerDeactivateLid.value: mockObj._thermocycler_deactivate_lid, - JTHC.thermocyclerSetTargetBlockTemperature.value: mockObj._thermocycler_set_block_temperature, # noqa: E501 - JTHC.thermocyclerSetTargetLidTemperature.value: mockObj._thermocycler_set_lid_temperature, # noqa: E501 + JTHC.thermocyclerSetTargetBlockTemperature.value: mockObj._thermocycler_set_block_temperature, + JTHC.thermocyclerSetTargetLidTemperature.value: mockObj._thermocycler_set_lid_temperature, JTHC.thermocyclerRunProfile.value: mockObj._thermocycler_run_profile, # NOTE: the thermocyclerAwaitX commands are expected to always # follow a corresponding SetX command, which is implemented as diff --git a/api/tests/opentrons/system/test_wifi.py b/api/tests/opentrons/system/test_wifi.py index 5c205a3a5c8..1efc4fe71d0 100644 --- a/api/tests/opentrons/system/test_wifi.py +++ b/api/tests/opentrons/system/test_wifi.py @@ -186,7 +186,7 @@ async def test_key_lifecycle(wifi_keys_tempdir): # We should not be able to upload a duplicate # TODO(mc, 2021-09-12): use pathlib - with open(os.path.join(source_td, "test1.pem"), "rb") as f: # type: ignore[assignment] # noqa: E501 + with open(os.path.join(source_td, "test1.pem"), "rb") as f: # type: ignore[assignment] add_response = wifi.add_key("test1.pem", f.read()) # type: ignore[arg-type] assert add_response.created is False diff --git a/api/tests/opentrons/test_execute.py b/api/tests/opentrons/test_execute.py index ab2b0ca6a70..8bdf05c64ab 100644 --- a/api/tests/opentrons/test_execute.py +++ b/api/tests/opentrons/test_execute.py @@ -65,8 +65,8 @@ def emit_runlog(entry: Any) -> None: execute.execute(protocol.filelike, "testosaur_v2.py", emit_runlog=emit_runlog) assert [item["payload"]["text"] for item in entries if item["$"] == "before"] == [ "Picking up tip from A1 of Opentrons 96 Tip Rack 300 µL on 1", - "Aspirating 10.0 uL from A1 of Corning 96 Well Plate 360 µL Flat on 2 at 150.0 uL/sec", # noqa: E501 - "Dispensing 10.0 uL into B1 of Corning 96 Well Plate 360 µL Flat on 2 at 300.0 uL/sec", # noqa: E501 + "Aspirating 10.0 uL from A1 of Corning 96 Well Plate 360 µL Flat on 2 at 150.0 uL/sec", + "Dispensing 10.0 uL into B1 of Corning 96 Well Plate 360 µL Flat on 2 at 300.0 uL/sec", "Dropping tip into H12 of Opentrons 96 Tip Rack 300 µL on 1", ] @@ -185,17 +185,17 @@ def emit_runlog(entry: Any) -> None: emit_runlog=emit_runlog, ) assert [item["payload"]["text"] for item in entries if item["$"] == "before"] == [ - "Transferring 1.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", # noqa: E501 + "Transferring 1.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", "Picking up tip from A1 of Opentrons 96 Tip Rack 10 µL on 3", "Aspirating 1.0 uL from A1 of FAKE example labware on 1 at" " 5.0 uL/sec", "Dispensing 1.0 uL into A4 of FAKE example labware on 1 at" " 10.0 uL/sec", "Dropping tip into A1 of Opentrons Fixed Trash on 12", - "Transferring 2.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", # noqa: E501 + "Transferring 2.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", "Picking up tip from B1 of Opentrons 96 Tip Rack 10 µL on 3", "Aspirating 2.0 uL from A1 of FAKE example labware on 1 at 5.0 uL/sec", "Dispensing 2.0 uL into A4 of FAKE example labware on 1 at" " 10.0 uL/sec", "Dropping tip into A1 of Opentrons Fixed Trash on 12", - "Transferring 3.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", # noqa: E501 + "Transferring 3.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", "Picking up tip from C1 of Opentrons 96 Tip Rack 10 µL on 3", "Aspirating 3.0 uL from A1 of FAKE example labware on 1 at 5.0 uL/sec", "Dispensing 3.0 uL into A4 of FAKE example labware on 1 at" " 10.0 uL/sec", diff --git a/api/tests/opentrons/test_simulate.py b/api/tests/opentrons/test_simulate.py index 10200447746..f9ed31e2288 100644 --- a/api/tests/opentrons/test_simulate.py +++ b/api/tests/opentrons/test_simulate.py @@ -29,8 +29,8 @@ def test_simulate_function_apiv2( assert [item["payload"]["text"] for item in runlog] == [ "2.0", "Picking up tip from A1 of Opentrons 96 Tip Rack 300 µL on 1", - "Aspirating 10.0 uL from A1 of Corning 96 Well Plate 360 µL Flat on 2 at 150.0 uL/sec", # noqa: E501, - "Dispensing 10.0 uL into B1 of Corning 96 Well Plate 360 µL Flat on 2 at 300.0 uL/sec", # noqa: E501, + "Aspirating 10.0 uL from A1 of Corning 96 Well Plate 360 µL Flat on 2 at 150.0 uL/sec", + "Dispensing 10.0 uL into B1 of Corning 96 Well Plate 360 µL Flat on 2 at 300.0 uL/sec", "Dropping tip into H12 of Opentrons 96 Tip Rack 300 µL on 1", ] @@ -64,17 +64,17 @@ def test_simulate_function_bundle_apiv2( ) assert bundle is None assert [item["payload"]["text"] for item in runlog] == [ - "Transferring 1.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", # noqa: E501 + "Transferring 1.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", "Picking up tip from A1 of Opentrons 96 Tip Rack 10 µL on 3", "Aspirating 1.0 uL from A1 of FAKE example labware on 1 at 5.0 uL/sec", "Dispensing 1.0 uL into A4 of FAKE example labware on 1 at" " 10.0 uL/sec", "Dropping tip into A1 of Opentrons Fixed Trash on 12", - "Transferring 2.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", # noqa: E501 + "Transferring 2.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", "Picking up tip from B1 of Opentrons 96 Tip Rack 10 µL on 3", "Aspirating 2.0 uL from A1 of FAKE example labware on 1 at 5.0 uL/sec", "Dispensing 2.0 uL into A4 of FAKE example labware on 1 at" " 10.0 uL/sec", "Dropping tip into A1 of Opentrons Fixed Trash on 12", - "Transferring 3.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", # noqa: E501 + "Transferring 3.0 from A1 of FAKE example labware on 1 to A4 of FAKE example labware on 1", "Picking up tip from C1 of Opentrons 96 Tip Rack 10 µL on 3", "Aspirating 3.0 uL from A1 of FAKE example labware on 1 at 5.0 uL/sec", "Dispensing 3.0 uL into A4 of FAKE example labware on 1 at" " 10.0 uL/sec", diff --git a/api/tests/opentrons/util/test_linal.py b/api/tests/opentrons/util/test_linal.py index 478ea1b7c84..fa90bfe9a90 100755 --- a/api/tests/opentrons/util/test_linal.py +++ b/api/tests/opentrons/util/test_linal.py @@ -25,7 +25,7 @@ def test_solve() -> None: expected2 = np.array( [cos(theta + pi / 2) * scale + 0.5, sin(theta + pi / 2) * scale + 0.25, 1] ) - result = np.dot(X, np.array([[0], [1], [1]])).transpose() # type: ignore[no-untyped-call] # noqa: E501 + result = np.dot(X, np.array([[0], [1], [1]])).transpose() # type: ignore[no-untyped-call] assert np.isclose(expected2, result).all() diff --git a/g-code-testing/.flake8 b/g-code-testing/.flake8 index cb6bafadab7..7b63f02487d 100644 --- a/g-code-testing/.flake8 +++ b/g-code-testing/.flake8 @@ -1,15 +1,14 @@ [flake8] -# set line-length for future black support -# https://github.com/psf/black/blob/master/docs/compatible_configs.md -max-line-length = 88 - # max cyclomatic complexity max-complexity = 9 extend-ignore = - # ignore E203 because black might reformat it + # defer formatting concerns to black + # E203: space around `:` operator + # E501: maximum line length E203, + E501, # do not require type annotations for self nor cls ANN101, ANN102 @@ -23,4 +22,4 @@ noqa-require-code = true per-file-ignores = setup.py:ANN,D g_code_parsing/**:ANN,D - tests/**:ANN,D \ No newline at end of file + tests/**:ANN,D diff --git a/g-code-testing/g_code_parsing/g_code.py b/g-code-testing/g_code_parsing/g_code.py index 2541403c1ba..b5787d18101 100644 --- a/g-code-testing/g_code_parsing/g_code.py +++ b/g-code-testing/g_code_parsing/g_code.py @@ -10,7 +10,7 @@ from opentrons.drivers.heater_shaker.driver import GCODE as HEATER_SHAKER_G_CODE from g_code_parsing.utils import reverse_enum from opentrons.hardware_control.emulation.parser import Parser -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( Explanation, ) from g_code_parsing.g_code_functionality_defs import ( @@ -37,39 +37,39 @@ class GCode: SMOOTHIE_G_CODE.HOME.name: smoothie.HomeGCodeFunctionalityDef, SMOOTHIE_G_CODE.SET_CURRENT.name: smoothie.SetCurrentGCodeFunctionalityDef, SMOOTHIE_G_CODE.DWELL.name: smoothie.DwellGCodeFunctionalityDef, - SMOOTHIE_G_CODE.CURRENT_POSITION.name: smoothie.CurrentPositionGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.LIMIT_SWITCH_STATUS.name: smoothie.LimitSwitchStatusGCodeFunctionalityDef, # noqa: E501 + SMOOTHIE_G_CODE.CURRENT_POSITION.name: smoothie.CurrentPositionGCodeFunctionalityDef, + SMOOTHIE_G_CODE.LIMIT_SWITCH_STATUS.name: smoothie.LimitSwitchStatusGCodeFunctionalityDef, SMOOTHIE_G_CODE.PROBE.name: smoothie.ProbeGCodeFunctionalityDef, - SMOOTHIE_G_CODE.ABSOLUTE_COORDS.name: smoothie.AbsoluteCoordinateModeGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.RELATIVE_COORDS.name: smoothie.RelativeCoordinateModeGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.RESET_FROM_ERROR.name: smoothie.ResetFromErrorGCodeFunctionalityDef, # noqa: E501 + SMOOTHIE_G_CODE.ABSOLUTE_COORDS.name: smoothie.AbsoluteCoordinateModeGCodeFunctionalityDef, + SMOOTHIE_G_CODE.RELATIVE_COORDS.name: smoothie.RelativeCoordinateModeGCodeFunctionalityDef, + SMOOTHIE_G_CODE.RESET_FROM_ERROR.name: smoothie.ResetFromErrorGCodeFunctionalityDef, SMOOTHIE_G_CODE.PUSH_SPEED.name: smoothie.PushSpeedGCodeFunctionalityDef, SMOOTHIE_G_CODE.POP_SPEED.name: smoothie.PopSpeedGCodeFunctionalityDef, SMOOTHIE_G_CODE.STEPS_PER_MM.name: smoothie.StepsPerMMGCodeFunctionalityDef, SMOOTHIE_G_CODE.SET_MAX_SPEED.name: smoothie.SetMaxSpeedGCodeFunctionalityDef, SMOOTHIE_G_CODE.ACCELERATION.name: smoothie.AccelerationGCodeFunctionalityDef, - SMOOTHIE_G_CODE.DISENGAGE_MOTOR.name: smoothie.DisengageMotorGCodeFunctionalityDef, # noqa: E501 + SMOOTHIE_G_CODE.DISENGAGE_MOTOR.name: smoothie.DisengageMotorGCodeFunctionalityDef, SMOOTHIE_G_CODE.HOMING_STATUS.name: smoothie.HomingStatusGCodeFunctionalityDef, - SMOOTHIE_G_CODE.MICROSTEPPING_B_DISABLE.name: smoothie.MicrosteppingBDisableGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.MICROSTEPPING_B_ENABLE.name: smoothie.MicrosteppingBEnableGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.MICROSTEPPING_C_DISABLE.name: smoothie.MicrosteppingCDisableGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.MICROSTEPPING_C_ENABLE.name: smoothie.MicrosteppingCEnableGCodeFunctionalityDef, # noqa: E501 + SMOOTHIE_G_CODE.MICROSTEPPING_B_DISABLE.name: smoothie.MicrosteppingBDisableGCodeFunctionalityDef, + SMOOTHIE_G_CODE.MICROSTEPPING_B_ENABLE.name: smoothie.MicrosteppingBEnableGCodeFunctionalityDef, + SMOOTHIE_G_CODE.MICROSTEPPING_C_DISABLE.name: smoothie.MicrosteppingCDisableGCodeFunctionalityDef, + SMOOTHIE_G_CODE.MICROSTEPPING_C_ENABLE.name: smoothie.MicrosteppingCEnableGCodeFunctionalityDef, SMOOTHIE_G_CODE.PIPETTE_HOME.name: smoothie.SetPipetteHomeGCodeFunctionalityDef, - SMOOTHIE_G_CODE.PIPETTE_RETRACT.name: smoothie.SetPipetteRetractGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.PIPETTE_DEBOUNCE.name: smoothie.SetPipetteDebounceGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.PIPETTE_MAX_TRAVEL.name: smoothie.SetPipetteMaxTravelGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.READ_INSTRUMENT_MODEL.name: smoothie.ReadInstrumentModelGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.READ_INSTRUMENT_ID.name: smoothie.ReadInstrumentIDGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.WRITE_INSTRUMENT_ID.name: smoothie.WriteInstrumentIDGCodeFunctionalityDef, # noqa: E501 - SMOOTHIE_G_CODE.WRITE_INSTRUMENT_MODEL.name: smoothie.WriteInstrumentModelGCodeFunctionalityDef, # noqa: E501 + SMOOTHIE_G_CODE.PIPETTE_RETRACT.name: smoothie.SetPipetteRetractGCodeFunctionalityDef, + SMOOTHIE_G_CODE.PIPETTE_DEBOUNCE.name: smoothie.SetPipetteDebounceGCodeFunctionalityDef, + SMOOTHIE_G_CODE.PIPETTE_MAX_TRAVEL.name: smoothie.SetPipetteMaxTravelGCodeFunctionalityDef, + SMOOTHIE_G_CODE.READ_INSTRUMENT_MODEL.name: smoothie.ReadInstrumentModelGCodeFunctionalityDef, + SMOOTHIE_G_CODE.READ_INSTRUMENT_ID.name: smoothie.ReadInstrumentIDGCodeFunctionalityDef, + SMOOTHIE_G_CODE.WRITE_INSTRUMENT_ID.name: smoothie.WriteInstrumentIDGCodeFunctionalityDef, + SMOOTHIE_G_CODE.WRITE_INSTRUMENT_MODEL.name: smoothie.WriteInstrumentModelGCodeFunctionalityDef, } MAGDECK_G_CODE_EXPLANATION_MAPPING = { MAGDECK_G_CODE.HOME.name: magdeck.HomeGCodeFunctionalityDef, MAGDECK_G_CODE.MOVE.name: magdeck.MoveGCodeFunctionalityDef, - MAGDECK_G_CODE.GET_CURRENT_POSITION.name: magdeck.CurrentPositionGCodeFunctionalityDef, # noqa: E501 + MAGDECK_G_CODE.GET_CURRENT_POSITION.name: magdeck.CurrentPositionGCodeFunctionalityDef, MAGDECK_G_CODE.PROBE_PLATE.name: magdeck.ProbeGCodeFunctionalityDef, - MAGDECK_G_CODE.GET_PLATE_HEIGHT.name: magdeck.GetPlateHeightGCodeFunctionalityDef, # noqa: E501 + MAGDECK_G_CODE.GET_PLATE_HEIGHT.name: magdeck.GetPlateHeightGCodeFunctionalityDef, MAGDECK_G_CODE.DEVICE_INFO.name: magdeck.DeviceInfoGCodeFunctionalityDef, } @@ -82,30 +82,30 @@ class GCode: THERMOCYCLER_G_CODE_EXPLANATION_MAPPING = { THERMOCYCLER_G_CODE.CLOSE_LID.name: thermocycler.CloseLidGCodeFunctionalityDef, - THERMOCYCLER_G_CODE.DEVICE_INFO.name: thermocycler.DeviceInfoGCodeFunctionalityDef, # noqa: E501 - THERMOCYCLER_G_CODE.GET_PLATE_TEMP.name: thermocycler.GetPlateTempGCodeFunctionalityDef, # noqa: E501 - THERMOCYCLER_G_CODE.GET_LID_STATUS.name: thermocycler.LidStatusGCodeFunctionalityDef, # noqa: E501 + THERMOCYCLER_G_CODE.DEVICE_INFO.name: thermocycler.DeviceInfoGCodeFunctionalityDef, + THERMOCYCLER_G_CODE.GET_PLATE_TEMP.name: thermocycler.GetPlateTempGCodeFunctionalityDef, + THERMOCYCLER_G_CODE.GET_LID_STATUS.name: thermocycler.LidStatusGCodeFunctionalityDef, THERMOCYCLER_G_CODE.OPEN_LID.name: thermocycler.OpenLidGCodeFunctionalityDef, - THERMOCYCLER_G_CODE.SET_PLATE_TEMP.name: thermocycler.SetPlateTempGCodeFunctionalityDef, # noqa: E501 - THERMOCYCLER_G_CODE.SET_LID_TEMP.name: thermocycler.SetLidTempGCodeFunctionalityDef, # noqa: E501 - THERMOCYCLER_G_CODE.GET_LID_TEMP.name: thermocycler.GetLidTempGCodeFunctionalityDef, # noqa: E501 - THERMOCYCLER_G_CODE.SET_RAMP_RATE.name: thermocycler.SetRampRateGCodeFunctionalityDef, # noqa: E501 - THERMOCYCLER_G_CODE.DEACTIVATE_LID.name: thermocycler.DeactivateLidGCodeFunctionalityDef, # noqa: E501 - THERMOCYCLER_G_CODE.DEACTIVATE_BLOCK.name: thermocycler.DeactivateBlockGCodeFunctionalityDef, # noqa: E501 - THERMOCYCLER_G_CODE.DEACTIVATE_ALL.name: thermocycler.DeactivateAllGCodeFunctionalityDef, # noqa: E501 - THERMOCYCLER_G_CODE.EDIT_PID_PARAMS.name: thermocycler.EditPIDParamsGCodeFunctionalityDef, # noqa: E501 + THERMOCYCLER_G_CODE.SET_PLATE_TEMP.name: thermocycler.SetPlateTempGCodeFunctionalityDef, + THERMOCYCLER_G_CODE.SET_LID_TEMP.name: thermocycler.SetLidTempGCodeFunctionalityDef, + THERMOCYCLER_G_CODE.GET_LID_TEMP.name: thermocycler.GetLidTempGCodeFunctionalityDef, + THERMOCYCLER_G_CODE.SET_RAMP_RATE.name: thermocycler.SetRampRateGCodeFunctionalityDef, + THERMOCYCLER_G_CODE.DEACTIVATE_LID.name: thermocycler.DeactivateLidGCodeFunctionalityDef, + THERMOCYCLER_G_CODE.DEACTIVATE_BLOCK.name: thermocycler.DeactivateBlockGCodeFunctionalityDef, + THERMOCYCLER_G_CODE.DEACTIVATE_ALL.name: thermocycler.DeactivateAllGCodeFunctionalityDef, + THERMOCYCLER_G_CODE.EDIT_PID_PARAMS.name: thermocycler.EditPIDParamsGCodeFunctionalityDef, } HEATER_SHAKER_G_CODE_EXPLANATION_MAPPING = { HEATER_SHAKER_G_CODE.SET_RPM.name: heater_shaker.SetRPMGCodeFunctionalityDef, HEATER_SHAKER_G_CODE.GET_RPM.name: heater_shaker.GetRPMGCodeFunctionalityDef, - HEATER_SHAKER_G_CODE.SET_TEMPERATURE.name: heater_shaker.SetTempGCodeFunctionalityDef, # noqa: E501 - HEATER_SHAKER_G_CODE.GET_TEMPERATURE.name: heater_shaker.GetTempGCodeFunctionalityDef, # noqa: E501 + HEATER_SHAKER_G_CODE.SET_TEMPERATURE.name: heater_shaker.SetTempGCodeFunctionalityDef, + HEATER_SHAKER_G_CODE.GET_TEMPERATURE.name: heater_shaker.GetTempGCodeFunctionalityDef, HEATER_SHAKER_G_CODE.HOME.name: heater_shaker.HomeGCodeFunctionalityDef, - HEATER_SHAKER_G_CODE.GET_VERSION.name: heater_shaker.GetVersionGCodeFunctionalityDef, # noqa: E501 - HEATER_SHAKER_G_CODE.OPEN_LABWARE_LATCH.name: heater_shaker.OpenLabwareLatchGCodeFunctionalityDef, # noqa: E501 - HEATER_SHAKER_G_CODE.CLOSE_LABWARE_LATCH.name: heater_shaker.CloseLabwareLatchGCodeFunctionalityDef, # noqa: E501 - HEATER_SHAKER_G_CODE.GET_LABWARE_LATCH_STATE.name: heater_shaker.GetLabwareLatchStateGCodeFunctionalityDef, # noqa: E501 + HEATER_SHAKER_G_CODE.GET_VERSION.name: heater_shaker.GetVersionGCodeFunctionalityDef, + HEATER_SHAKER_G_CODE.OPEN_LABWARE_LATCH.name: heater_shaker.OpenLabwareLatchGCodeFunctionalityDef, + HEATER_SHAKER_G_CODE.CLOSE_LABWARE_LATCH.name: heater_shaker.CloseLabwareLatchGCodeFunctionalityDef, + HEATER_SHAKER_G_CODE.GET_LABWARE_LATCH_STATE.name: heater_shaker.GetLabwareLatchStateGCodeFunctionalityDef, } # Smoothie G-Code Parsing Characters diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/close_labware_latch_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/close_labware_latch_functionality_def.py index 94f672f743f..c6b64e9ad31 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/close_labware_latch_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/close_labware_latch_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_labware_latch_state_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_labware_latch_state_functionality_def.py index a6c8aa90797..c88b8b0d1c8 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_labware_latch_state_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_labware_latch_state_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_rpm_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_rpm_functionality_def.py index 84f0fa4c25b..04901df5ad4 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_rpm_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_rpm_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_temperature_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_temperature_functionality_def.py index 6c37ddc680d..f112a8d3480 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_temperature_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_temperature_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_version_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_version_functionality_def.py index 89f82a4e6a0..40815a05b3c 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_version_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/get_version_functionality_def.py @@ -1,13 +1,13 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) class GetVersionGCodeFunctionalityDef(GCodeFunctionalityDefBase): RESPONSE_RE = re.compile( - r"FW:(?P.*) HW:(?P.*) SerialNo:(?P.*) " # noqa: E501 + r"FW:(?P.*) HW:(?P.*) SerialNo:(?P.*) " ) @classmethod diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/home_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/home_functionality_def.py index 731f0e61d18..09c59cfcf30 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/home_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/home_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/open_labware_latch_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/open_labware_latch_functionality_def.py index 17bd2c55fdf..fb1da89cad3 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/open_labware_latch_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/open_labware_latch_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/set_rpm_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/set_rpm_functionality_def.py index 48089163257..ecc10fcd4f5 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/set_rpm_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/set_rpm_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/set_temperature_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/set_temperature_functionality_def.py index 0e764ccd471..12a29b1b01b 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/set_temperature_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/heater_shaker/set_temperature_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/current_position_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/current_position_g_code_functionality_def.py index a62f8cfb90f..d042cb57466 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/current_position_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/current_position_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/device_info_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/device_info_g_code_functionality_def.py index 513c2c27abf..b6fbf0e9491 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/device_info_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/device_info_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/get_plate_height_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/get_plate_height_g_code_functionality_def.py index 0c7f4675e36..5374fd31c51 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/get_plate_height_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/get_plate_height_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/home_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/home_g_code_functionality_def.py index 087f1a0d343..1464eb9f059 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/home_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/home_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/move_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/move_g_code_functionality_def.py index 0ce91605435..612210b4c78 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/move_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/move_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/probe_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/probe_g_code_functionality_def.py index e631ec1d699..d60d2765577 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/probe_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/magdeck/probe_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/absolute_coordinate_mode_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/absolute_coordinate_mode_g_code_functionality_def.py index 293602cac0b..cfa649dc436 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/absolute_coordinate_mode_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/absolute_coordinate_mode_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/acceleration_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/acceleration_g_code_functionality_def.py index d038ff3d46b..185315ea887 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/acceleration_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/acceleration_g_code_functionality_def.py @@ -1,7 +1,7 @@ from typing import Dict from string import Template from enum import Enum -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/current_position_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/current_position_g_code_functionality_def.py index b279a9f79b7..0a2c57ea07e 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/current_position_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/current_position_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/disengage_motor_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/disengage_motor_g_code_functionality_def.py index cca2bfa8492..7c0e3ffa303 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/disengage_motor_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/disengage_motor_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/dwell_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/dwell_g_code_functionality_def.py index aafeeb3cff8..4ae5d89ef91 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/dwell_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/dwell_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/home_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/home_g_code_functionality_def.py index 2671e220b09..43592509f39 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/home_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/home_g_code_functionality_def.py @@ -1,6 +1,6 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/homing_status_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/homing_status_g_code_functionality_def.py index da021161466..77df7ba6f7f 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/homing_status_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/homing_status_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/limit_switch_status_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/limit_switch_status_g_code_functionality_def.py index 2b87c7a80b3..5ef3d751a08 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/limit_switch_status_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/limit_switch_status_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_b_disable_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_b_disable_g_code_functionality_def.py index 6b7863a86d7..a1ec11fe215 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_b_disable_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_b_disable_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_b_enable_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_b_enable_g_code_functionality_def.py index aabb82398ca..59f2b1ad90b 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_b_enable_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_b_enable_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_c_disable_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_c_disable_g_code_functionality_def.py index a956514dcf4..db0c0f5dfdb 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_c_disable_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_c_disable_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_c_enable_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_c_enable_g_code_functionality_def.py index b456c676adb..fcf7fe16840 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_c_enable_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/microstepping_c_enable_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/move_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/move_g_code_functionality_def.py index 9f2cfae5c59..b5d170a92ea 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/move_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/move_g_code_functionality_def.py @@ -1,7 +1,7 @@ from typing import Dict from string import Template from enum import Enum -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/pop_speed_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/pop_speed_g_code_functionality_def.py index e00b86bf608..3b507fc1c93 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/pop_speed_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/pop_speed_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/probe_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/probe_g_code_functionality_def.py index 4815f2d2406..3db7411a9e7 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/probe_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/probe_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/push_speed_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/push_speed_g_code_functionality_def.py index 3915a9bb719..59015c81755 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/push_speed_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/push_speed_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/read_instrument_id_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/read_instrument_id_g_code_functionality_def.py index 61dc5bb6efb..41d1b01ced6 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/read_instrument_id_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/read_instrument_id_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) from opentrons.drivers.smoothie_drivers.parse_utils import byte_array_to_ascii_string diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/read_instrument_model_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/read_instrument_model_g_code_functionality_def.py index b8cbae2741c..a051303ea7f 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/read_instrument_model_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/read_instrument_model_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) from opentrons.drivers.smoothie_drivers.parse_utils import byte_array_to_ascii_string diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/relative_coordinate_mode_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/relative_coordinate_mode_g_code_functionality_def.py index e44da5d20cc..3036bd89fd4 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/relative_coordinate_mode_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/relative_coordinate_mode_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/reset_from_error_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/reset_from_error_g_code_functionality_def.py index 49735d6e7ea..733ac77798c 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/reset_from_error_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/reset_from_error_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_current_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_current_g_code_functionality_def.py index dad11438dd8..aec18b4bb79 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_current_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_current_g_code_functionality_def.py @@ -1,7 +1,7 @@ from typing import Dict from string import Template from enum import Enum -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_max_speed_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_max_speed_g_code_functionality_def.py index 0604d77814b..ced60700cca 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_max_speed_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_max_speed_g_code_functionality_def.py @@ -1,6 +1,6 @@ from typing import Dict from string import Template -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_debounce_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_debounce_g_code_functionality_def.py index 35e3fa9ca7b..f5d8500b5b1 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_debounce_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_debounce_g_code_functionality_def.py @@ -1,6 +1,6 @@ from typing import Dict from string import Template -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_home_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_home_g_code_functionality_def.py index 0854f2ff92b..1070dcf3245 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_home_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_home_g_code_functionality_def.py @@ -1,6 +1,6 @@ from typing import Dict from string import Template -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_max_travel_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_max_travel_g_code_functionality_def.py index e7ade26b15d..511b7a60041 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_max_travel_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_max_travel_g_code_functionality_def.py @@ -1,6 +1,6 @@ from typing import Dict from string import Template -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_retract_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_retract_g_code_functionality_def.py index e981edfd2dd..f8a8b286d39 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_retract_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_pipette_retract_g_code_functionality_def.py @@ -1,6 +1,6 @@ from typing import Dict from string import Template -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_speed_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_speed_g_code_functionality_def.py index 64340a40b90..5c91d580feb 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_speed_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/set_speed_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/steps_per_mm_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/steps_per_mm_g_code_functionality_def.py index 00639138e54..8a34102836c 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/steps_per_mm_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/steps_per_mm_g_code_functionality_def.py @@ -1,7 +1,7 @@ import re from typing import Dict from string import Template -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/wait_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/wait_g_code_functionality_def.py index 780de325fd5..81ec48382b6 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/wait_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/wait_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/write_instrument_id_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/write_instrument_id_g_code_functionality_def.py index a669d60f0c4..737abf8acc6 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/write_instrument_id_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/write_instrument_id_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/write_instrument_model_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/write_instrument_model_g_code_functionality_def.py index 5c5e2390959..ca4ff56b1fd 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/write_instrument_model_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/smoothie/write_instrument_model_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/device_info_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/device_info_g_code_functionality_def.py index ce95aa8f6d1..e86ad61cb0b 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/device_info_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/device_info_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/disengage_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/disengage_g_code_functionality_def.py index 1a2578c799d..679682c3bb8 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/disengage_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/disengage_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/get_temp_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/get_temp_g_code_functionality_def.py index e7ff6d80bac..7ccb01449b5 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/get_temp_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/get_temp_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/set_temp_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/set_temp_g_code_functionality_def.py index c513961839f..46bb828e4a1 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/set_temp_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/tempdeck/set_temp_g_code_functionality_def.py @@ -1,7 +1,7 @@ from typing import Dict from string import Template from enum import Enum -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/close_lid_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/close_lid_g_code_functionality_def.py index 061068c5f5c..b88e36243d9 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/close_lid_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/close_lid_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_all_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_all_g_code_functionality_def.py index d817937dde6..0e3339a78b0 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_all_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_all_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_block_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_block_g_code_functionality_def.py index bf3d50e80e2..5becb44f454 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_block_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_block_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_lid_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_lid_g_code_functionality_def.py index 13bcf68e308..cec3d04b570 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_lid_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/deactivate_lid_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/device_info_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/device_info_g_code_functionality_def.py index 695b841bc4e..49c47799256 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/device_info_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/device_info_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/edit_pid_params_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/edit_pid_params_g_code_functionality_def.py index 7a2e7b282ad..9d80b9e2082 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/edit_pid_params_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/edit_pid_params_g_code_functionality_def.py @@ -1,7 +1,7 @@ from typing import Dict from string import Template from enum import Enum -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/get_lid_temp_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/get_lid_temp_g_code_functionality_def.py index fd99a473464..8690c49e645 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/get_lid_temp_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/get_lid_temp_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/get_plate_temp_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/get_plate_temp_g_code_functionality_def.py index 9a16f6db2c9..024dcd2d5d6 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/get_plate_temp_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/get_plate_temp_g_code_functionality_def.py @@ -3,7 +3,7 @@ from string import Template from distutils.util import strtobool from opentrons.drivers.utils import parse_key_values -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/lid_status_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/lid_status_g_code_functionality_def.py index 89240826d31..983cf8d60c4 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/lid_status_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/lid_status_g_code_functionality_def.py @@ -1,6 +1,6 @@ import re from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/open_lid_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/open_lid_g_code_functionality_def.py index 206d3406d14..d08edc5828f 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/open_lid_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/open_lid_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_lid_temp_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_lid_temp_g_code_functionality_def.py index e9570d207b4..7eb6c860706 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_lid_temp_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_lid_temp_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_plate_temp_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_plate_temp_g_code_functionality_def.py index 36e16d9674e..42012002eaa 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_plate_temp_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_plate_temp_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_ramp_rate_g_code_functionality_def.py b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_ramp_rate_g_code_functionality_def.py index 7fc6e4108a3..421a86ab2fc 100644 --- a/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_ramp_rate_g_code_functionality_def.py +++ b/g-code-testing/g_code_parsing/g_code_functionality_defs/thermocycler/set_ramp_rate_g_code_functionality_def.py @@ -1,5 +1,5 @@ from typing import Dict -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( GCodeFunctionalityDefBase, ) diff --git a/g-code-testing/tests/g_code_parsing/test_g_code.py b/g-code-testing/tests/g_code_parsing/test_g_code.py index 64620aee34f..0c8f95023eb 100644 --- a/g-code-testing/tests/g_code_parsing/test_g_code.py +++ b/g-code-testing/tests/g_code_parsing/test_g_code.py @@ -1,5 +1,5 @@ import pytest -from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( # noqa: E501 +from g_code_parsing.g_code_functionality_defs.g_code_functionality_def_base import ( Explanation, ) from g_code_parsing.g_code import GCode diff --git a/hardware/.flake8 b/hardware/.flake8 index ccf831524b8..ffad76e93a9 100644 --- a/hardware/.flake8 +++ b/hardware/.flake8 @@ -1,15 +1,14 @@ [flake8] -# set line-length for future black support -# https://github.com/psf/black/blob/master/docs/compatible_configs.md -max-line-length = 88 - # max cyclomatic complexity max-complexity = 9 extend-ignore = - # ignore E203 because black might reformat it + # defer formatting concerns to black + # E203: space around `:` operator + # E501: maximum line length E203, + E501, # do not require type annotations for self nor cls ANN101, ANN102 diff --git a/hardware/opentrons_hardware/drivers/can_bus/can_messenger.py b/hardware/opentrons_hardware/drivers/can_bus/can_messenger.py index e308ddae87f..416cb9be66a 100644 --- a/hardware/opentrons_hardware/drivers/can_bus/can_messenger.py +++ b/hardware/opentrons_hardware/drivers/can_bus/can_messenger.py @@ -138,7 +138,7 @@ async def _read_task(self) -> None: for listener, filter in self._listeners.values(): if filter and not filter(message.arbitration_id): continue - listener(message_definition(payload=build), message.arbitration_id) # type: ignore[arg-type] # noqa: E501 + listener(message_definition(payload=build), message.arbitration_id) # type: ignore[arg-type] except BinarySerializableException: log.exception(f"Failed to build from {message}") else: diff --git a/hardware/opentrons_hardware/scripts/can_comm.py b/hardware/opentrons_hardware/scripts/can_comm.py index f5f74881ddf..7705be3ea60 100644 --- a/hardware/opentrons_hardware/scripts/can_comm.py +++ b/hardware/opentrons_hardware/scripts/can_comm.py @@ -72,7 +72,7 @@ def create_choices(enum_type: Type[Enum]) -> Sequence[str]: """ # mypy wants type annotation for v. - return [f"{i}: {v.name}" for (i, v) in enumerate(enum_type)] # type: ignore[var-annotated] # noqa: E501 + return [f"{i}: {v.name}" for (i, v) in enumerate(enum_type)] # type: ignore[var-annotated] PromptedEnum = TypeVar("PromptedEnum", bound=Enum, covariant=True) diff --git a/hardware/opentrons_hardware/scripts/sensors.py b/hardware/opentrons_hardware/scripts/sensors.py index c59a301e905..3748efd1bd5 100644 --- a/hardware/opentrons_hardware/scripts/sensors.py +++ b/hardware/opentrons_hardware/scripts/sensors.py @@ -40,7 +40,7 @@ def create_choices(enum_type: Type[Enum]) -> Sequence[str]: """ # mypy wants type annotation for v. - return [f"{i}: {v.name}" for (i, v) in enumerate(enum_type)] # type: ignore[var-annotated] # noqa: E501 + return [f"{i}: {v.name}" for (i, v) in enumerate(enum_type)] # type: ignore[var-annotated] def prompt_sensor_type( diff --git a/hardware/setup.py b/hardware/setup.py index ee6a1ce5c13..50c5c23e796 100644 --- a/hardware/setup.py +++ b/hardware/setup.py @@ -84,7 +84,7 @@ def read(*parts: str) -> str: "opentrons_update_fw = opentrons_hardware.scripts.update_fw:main", "opentrons_can_comm = opentrons_hardware.scripts.can_comm:main", "opentrons_can_mon = opentrons_hardware.scripts.can_mon:main", - "opentrons_sim_can_bus = opentrons_hardware.scripts.sim_socket_can:main", # noqa: E501 + "opentrons_sim_can_bus = opentrons_hardware.scripts.sim_socket_can:main", "opentrons_can_control = opentrons_hardware.scripts.can_control:main", ] }, diff --git a/notify-server/.flake8 b/notify-server/.flake8 index 6c6c1f4bf51..cc6c8e5661c 100644 --- a/notify-server/.flake8 +++ b/notify-server/.flake8 @@ -1,4 +1,11 @@ [flake8] -ignore = ANN101, ANN102 -max-line-length = 88 +extend-ignore = + # defer formatting concerns to black + # E203: space around `:` operator + # E501: maximum line length + E203, + E501, + # do not require type annotations for self nor cls + ANN101, + ANN102 diff --git a/notify-server/notify_server/logging.py b/notify-server/notify_server/logging.py index 4cb54f7752d..ca777c3c1ef 100644 --- a/notify-server/notify_server/logging.py +++ b/notify-server/notify_server/logging.py @@ -50,7 +50,7 @@ def _dev_log_config() -> Dict[str, Any]: "disable_existing_loggers": False, "formatters": { "basic": { - "format": "%(asctime)s %(name)s %(levelname)s [Line %(lineno)s] %(message)s" # noqa: E501 + "format": "%(asctime)s %(name)s %(levelname)s [Line %(lineno)s] %(message)s" }, }, "handlers": { diff --git a/robot-server/.flake8 b/robot-server/.flake8 index fd1238096fb..18d8c87da17 100644 --- a/robot-server/.flake8 +++ b/robot-server/.flake8 @@ -1,15 +1,14 @@ [flake8] -# set line-length for future black support -# https://github.com/psf/black/blob/master/docs/compatible_configs.md -max-line-length = 88 - # max cyclomatic complexity max-complexity = 9 extend-ignore = - # ignore E203 because black might reformat it + # defer formatting concerns to black + # E203: space around `:` operator + # E501: maximum line length E203, + E501, # do not require type annotations for self nor cls ANN101, ANN102 diff --git a/robot-server/robot_server/robot/calibration/check/user_flow.py b/robot-server/robot_server/robot/calibration/check/user_flow.py index 15c4c34c620..7308fc9f633 100644 --- a/robot-server/robot_server/robot/calibration/check/user_flow.py +++ b/robot-server/robot_server/robot/calibration/check/user_flow.py @@ -128,15 +128,15 @@ def __init__( CalibrationCommand.invalidate_tip: self.invalidate_tip, CheckCalibrationCommand.compare_point: self.update_comparison_map, CalibrationCommand.move_to_tip_rack: self.move_to_tip_rack, - CalibrationCommand.move_to_reference_point: self.move_to_reference_point, # noqa: E501 + CalibrationCommand.move_to_reference_point: self.move_to_reference_point, CalibrationCommand.move_to_deck: self.move_to_deck, CalibrationCommand.move_to_point_one: self.move_to_point_one, DeckCalibrationCommand.move_to_point_two: self.move_to_point_two, - DeckCalibrationCommand.move_to_point_three: self.move_to_point_three, # noqa: E501 + DeckCalibrationCommand.move_to_point_three: self.move_to_point_three, CheckCalibrationCommand.switch_pipette: self.change_active_pipette, CheckCalibrationCommand.return_tip: self.return_tip, CheckCalibrationCommand.transition: self.transition, - CalibrationCommand.invalidate_last_action: self.invalidate_last_action, # noqa: E501 + CalibrationCommand.invalidate_last_action: self.invalidate_last_action, CalibrationCommand.exit: self.exit_session, } self._supported_commands = SupportedCommands(namespace="calibration") diff --git a/robot-server/robot_server/robot/calibration/deck/user_flow.py b/robot-server/robot_server/robot/calibration/deck/user_flow.py index 4177c753383..a2c5dc8368c 100644 --- a/robot-server/robot_server/robot/calibration/deck/user_flow.py +++ b/robot-server/robot_server/robot/calibration/deck/user_flow.py @@ -105,9 +105,9 @@ def __init__(self, hardware: HardwareControlAPI): CalibrationCommand.move_to_deck: self.move_to_deck, CalibrationCommand.move_to_point_one: self.move_to_point_one, DeckCalibrationCommand.move_to_point_two: self.move_to_point_two, - DeckCalibrationCommand.move_to_point_three: self.move_to_point_three, # noqa: E501 + DeckCalibrationCommand.move_to_point_three: self.move_to_point_three, CalibrationCommand.exit: self.exit_session, - CalibrationCommand.invalidate_last_action: self.invalidate_last_action, # noqa: E501 + CalibrationCommand.invalidate_last_action: self.invalidate_last_action, } self.hardware.set_robot_calibration( robot_cal.build_temporary_identity_calibration() diff --git a/robot-server/robot_server/robot/calibration/pipette_offset/user_flow.py b/robot-server/robot_server/robot/calibration/pipette_offset/user_flow.py index 80d7569be27..6a3c412eaea 100644 --- a/robot-server/robot_server/robot/calibration/pipette_offset/user_flow.py +++ b/robot-server/robot_server/robot/calibration/pipette_offset/user_flow.py @@ -134,7 +134,7 @@ def __init__( CalibrationCommand.move_to_tip_rack: self.move_to_tip_rack, CalibrationCommand.move_to_deck: self.move_to_deck, CalibrationCommand.move_to_point_one: self.move_to_point_one, - CalibrationCommand.set_has_calibration_block: self.set_has_calibration_block, # noqa: E501 + CalibrationCommand.set_has_calibration_block: self.set_has_calibration_block, CalibrationCommand.exit: self.exit_session, CalibrationCommand.invalidate_last_action: self.invalidate_last_action, } diff --git a/robot-server/robot_server/robot/calibration/tip_length/user_flow.py b/robot-server/robot_server/robot/calibration/tip_length/user_flow.py index e72e382fef9..7e6dbc2bcb1 100644 --- a/robot-server/robot_server/robot/calibration/tip_length/user_flow.py +++ b/robot-server/robot_server/robot/calibration/tip_length/user_flow.py @@ -69,9 +69,9 @@ def __init__( CalibrationCommand.pick_up_tip: self.pick_up_tip, CalibrationCommand.invalidate_tip: self.invalidate_tip, CalibrationCommand.save_offset: self.save_offset, - CalibrationCommand.move_to_reference_point: self.move_to_reference_point, # noqa: E501 - CalibrationCommand.move_to_tip_rack: self.move_to_tip_rack, # noqa: E501 - CalibrationCommand.invalidate_last_action: self.invalidate_last_action, # noqa: E501 + CalibrationCommand.move_to_reference_point: self.move_to_reference_point, + CalibrationCommand.move_to_tip_rack: self.move_to_tip_rack, + CalibrationCommand.invalidate_last_action: self.invalidate_last_action, CalibrationCommand.exit: self.exit_session, } self._default_tipracks = util.get_default_tipracks( diff --git a/robot-server/robot_server/service/logging.py b/robot-server/robot_server/service/logging.py index 5502e5cde7f..86bb1920f8b 100644 --- a/robot-server/robot_server/service/logging.py +++ b/robot-server/robot_server/service/logging.py @@ -75,7 +75,7 @@ def _dev_log_config(log_level: int) -> Dict[str, Any]: "disable_existing_loggers": False, "formatters": { "basic": { - "format": "%(asctime)s %(name)s %(levelname)s [Line %(lineno)s] %(message)s" # noqa: E501 + "format": "%(asctime)s %(name)s %(levelname)s [Line %(lineno)s] %(message)s" }, }, "handlers": { diff --git a/robot-server/robot_server/service/session/session_types/deck_calibration_session.py b/robot-server/robot_server/service/session/session_types/deck_calibration_session.py index a6069daaf47..455d8792b5e 100644 --- a/robot-server/robot_server/service/session/session_types/deck_calibration_session.py +++ b/robot-server/robot_server/service/session/session_types/deck_calibration_session.py @@ -99,7 +99,7 @@ def _get_response_details(self) -> DeckCalibrationSessionStatus: # DeckCalibrationSessionStatus has an exact type for instrument supported_commands = self._deck_cal_user_flow.supported_commands return DeckCalibrationSessionStatus( - instrument=self._deck_cal_user_flow.get_pipette(), # type: ignore[arg-type] # noqa: E501 + instrument=self._deck_cal_user_flow.get_pipette(), # type: ignore[arg-type] currentStep=self._deck_cal_user_flow.current_state, labware=self._deck_cal_user_flow.get_required_labware(), supportedCommands=supported_commands, diff --git a/robot-server/tests/integration/http_api/protocols/test_persistence.py b/robot-server/tests/integration/http_api/protocols/test_persistence.py index 8d40026a16d..a57da95cb95 100644 --- a/robot-server/tests/integration/http_api/protocols/test_persistence.py +++ b/robot-server/tests/integration/http_api/protocols/test_persistence.py @@ -132,10 +132,10 @@ async def test_protocol_labware_files_persist() -> None: assert restarted_protocol_detail == protocol_detail four_tuberack = Path( - f"{server.persistence_directory}/protocols/{protocol_id}/cpx_4_tuberack_100ul.json" # noqa: E501 + f"{server.persistence_directory}/protocols/{protocol_id}/cpx_4_tuberack_100ul.json" ) six_tuberack = Path( - f"{server.persistence_directory}/protocols/{protocol_id}/cpx_6_tuberack_100ul.json" # noqa: E501 + f"{server.persistence_directory}/protocols/{protocol_id}/cpx_6_tuberack_100ul.json" ) assert four_tuberack.is_file() assert six_tuberack.is_file() diff --git a/robot-server/tests/modules/test_module_data_mapper.py b/robot-server/tests/modules/test_module_data_mapper.py index 79634313683..1a9fcf10461 100644 --- a/robot-server/tests/modules/test_module_data_mapper.py +++ b/robot-server/tests/modules/test_module_data_mapper.py @@ -131,8 +131,8 @@ def test_maps_temperature_module_data(input_model: str, input_data: LiveData) -> usbPort=UsbPort(port=101, hub=202, path="/dev/null"), data=TemperatureModuleData( status=TemperatureStatus(input_data["status"]), - currentTemperature=input_data["data"]["currentTemp"], # type: ignore[arg-type] # noqa: E501 - targetTemperature=input_data["data"]["targetTemp"], # type: ignore[arg-type] # noqa: E501 + currentTemperature=input_data["data"]["currentTemp"], # type: ignore[arg-type] + targetTemperature=input_data["data"]["targetTemp"], # type: ignore[arg-type] ), ) @@ -214,17 +214,17 @@ def test_maps_thermocycler_module_data(input_model: str, input_data: LiveData) - usbPort=UsbPort(port=101, hub=202, path="/dev/null"), data=ThermocyclerModuleData( status=TemperatureStatus(input_data["status"]), - currentTemperature=input_data["data"]["currentTemp"], # type: ignore[arg-type] # noqa: E501 - targetTemperature=input_data["data"]["targetTemp"], # type: ignore[arg-type] # noqa: E501 + currentTemperature=input_data["data"]["currentTemp"], # type: ignore[arg-type] + targetTemperature=input_data["data"]["targetTemp"], # type: ignore[arg-type] lidStatus=input_data["data"]["lid"], # type: ignore[arg-type] lidTemperature=input_data["data"]["lidTemp"], # type: ignore[arg-type] - lidTargetTemperature=input_data["data"]["lidTarget"], # type: ignore[arg-type] # noqa: E501 + lidTargetTemperature=input_data["data"]["lidTarget"], # type: ignore[arg-type] holdTime=input_data["data"]["holdTime"], # type: ignore[arg-type] rampRate=input_data["data"]["rampRate"], # type: ignore[arg-type] - currentCycleIndex=input_data["data"]["currentCycleIndex"], # type: ignore[arg-type] # noqa: E501 - totalCycleCount=input_data["data"]["totalCycleCount"], # type: ignore[arg-type] # noqa: E501 - currentStepIndex=input_data["data"]["currentStepIndex"], # type: ignore[arg-type] # noqa: E501 - totalStepCount=input_data["data"]["totalStepCount"], # type: ignore[arg-type] # noqa: E501 + currentCycleIndex=input_data["data"]["currentCycleIndex"], # type: ignore[arg-type] + totalCycleCount=input_data["data"]["totalCycleCount"], # type: ignore[arg-type] + currentStepIndex=input_data["data"]["currentStepIndex"], # type: ignore[arg-type] + totalStepCount=input_data["data"]["totalStepCount"], # type: ignore[arg-type] ), ) @@ -300,13 +300,13 @@ def test_maps_heater_shaker_module_data(input_model: str, input_data: LiveData) usbPort=UsbPort(port=101, hub=202, path="/dev/null"), data=HeaterShakerModuleData( status=HeaterShakerStatus(input_data["status"]), - labwareLatchStatus=input_data["data"]["labwareLatchStatus"], # type: ignore[arg-type] # noqa: E501 + labwareLatchStatus=input_data["data"]["labwareLatchStatus"], # type: ignore[arg-type] speedStatus=input_data["data"]["speedStatus"], # type: ignore[arg-type] currentSpeed=input_data["data"]["currentSpeed"], # type: ignore[arg-type] targetSpeed=input_data["data"]["targetSpeed"], # type: ignore[arg-type] - temperatureStatus=input_data["data"]["temperatureStatus"], # type: ignore[arg-type] # noqa: E501 - currentTemperature=input_data["data"]["currentTemp"], # type: ignore[arg-type] # noqa: E501 - targetTemperature=input_data["data"]["targetTemp"], # type: ignore[arg-type] # noqa: E501 + temperatureStatus=input_data["data"]["temperatureStatus"], # type: ignore[arg-type] + currentTemperature=input_data["data"]["currentTemp"], # type: ignore[arg-type] + targetTemperature=input_data["data"]["targetTemp"], # type: ignore[arg-type] errorDetails=input_data["data"]["errorDetails"], # type: ignore[arg-type] ), ) diff --git a/robot-server/tests/runs/test_run_data_manager.py b/robot-server/tests/runs/test_run_data_manager.py index 76c532b4b7e..3f5b8ff1bce 100644 --- a/robot-server/tests/runs/test_run_data_manager.py +++ b/robot-server/tests/runs/test_run_data_manager.py @@ -59,11 +59,11 @@ def engine_state_summary() -> StateSummary: """Get a StateSummary value object.""" return StateSummary( status=EngineStatus.IDLE, - errors=[ErrorOccurrence.construct(id="some-error-id")], # type: ignore[call-arg] # noqa: E501 - labware=[LoadedLabware.construct(id="some-labware-id")], # type: ignore[call-arg] # noqa: E501 - labwareOffsets=[LabwareOffset.construct(id="some-labware-offset-id")], # type: ignore[call-arg] # noqa: E501 - pipettes=[LoadedPipette.construct(id="some-pipette-id")], # type: ignore[call-arg] # noqa: E501 - modules=[LoadedModule.construct(id="some-module-id")], # type: ignore[call-arg] # noqa: E501 + errors=[ErrorOccurrence.construct(id="some-error-id")], # type: ignore[call-arg] + labware=[LoadedLabware.construct(id="some-labware-id")], # type: ignore[call-arg] + labwareOffsets=[LabwareOffset.construct(id="some-labware-offset-id")], # type: ignore[call-arg] + pipettes=[LoadedPipette.construct(id="some-pipette-id")], # type: ignore[call-arg] + modules=[LoadedModule.construct(id="some-module-id")], # type: ignore[call-arg] ) @@ -353,20 +353,20 @@ async def test_get_all_runs( """It should get all runs, including current and historical.""" current_run_data = StateSummary( status=EngineStatus.IDLE, - errors=[ErrorOccurrence.construct(id="current-error-id")], # type: ignore[call-arg] # noqa: E501 - labware=[LoadedLabware.construct(id="current-labware-id")], # type: ignore[call-arg] # noqa: E501 - labwareOffsets=[LabwareOffset.construct(id="current-labware-offset-id")], # type: ignore[call-arg] # noqa: E501 - pipettes=[LoadedPipette.construct(id="current-pipette-id")], # type: ignore[call-arg] # noqa: E501 - modules=[LoadedModule.construct(id="current-module-id")], # type: ignore[call-arg] # noqa: E501 + errors=[ErrorOccurrence.construct(id="current-error-id")], # type: ignore[call-arg] + labware=[LoadedLabware.construct(id="current-labware-id")], # type: ignore[call-arg] + labwareOffsets=[LabwareOffset.construct(id="current-labware-offset-id")], # type: ignore[call-arg] + pipettes=[LoadedPipette.construct(id="current-pipette-id")], # type: ignore[call-arg] + modules=[LoadedModule.construct(id="current-module-id")], # type: ignore[call-arg] ) historical_run_data = StateSummary( status=EngineStatus.STOPPED, - errors=[ErrorOccurrence.construct(id="old-error-id")], # type: ignore[call-arg] # noqa: E501 - labware=[LoadedLabware.construct(id="old-labware-id")], # type: ignore[call-arg] # noqa: E501 - labwareOffsets=[LabwareOffset.construct(id="old-labware-offset-id")], # type: ignore[call-arg] # noqa: E501 - pipettes=[LoadedPipette.construct(id="old-pipette-id")], # type: ignore[call-arg] # noqa: E501 - modules=[LoadedModule.construct(id="old-module-id")], # type: ignore[call-arg] # noqa: E501 + errors=[ErrorOccurrence.construct(id="old-error-id")], # type: ignore[call-arg] + labware=[LoadedLabware.construct(id="old-labware-id")], # type: ignore[call-arg] + labwareOffsets=[LabwareOffset.construct(id="old-labware-offset-id")], # type: ignore[call-arg] + pipettes=[LoadedPipette.construct(id="old-pipette-id")], # type: ignore[call-arg] + modules=[LoadedModule.construct(id="old-module-id")], # type: ignore[call-arg] ) current_run_resource = RunResource( diff --git a/robot-server/tests/service/legacy/routers/test_settings.py b/robot-server/tests/service/legacy/routers/test_settings.py index e9b27146cf5..b5ea3c3de74 100644 --- a/robot-server/tests/service/legacy/routers/test_settings.py +++ b/robot-server/tests/service/legacy/routers/test_settings.py @@ -340,7 +340,7 @@ def test_set_log_level( @pytest.fixture def mock_get_all_adv_settings(): with patch( - "robot_server.service.legacy.routers.settings.advanced_settings.get_all_adv_settings" # noqa: E501 + "robot_server.service.legacy.routers.settings.advanced_settings.get_all_adv_settings" ) as p: p.return_value = { s.id: advanced_settings.Setting(value=False, definition=s) @@ -352,7 +352,7 @@ def mock_get_all_adv_settings(): @pytest.fixture def mock_is_restart_required(): with patch( - "robot_server.service.legacy.routers.settings.advanced_settings.is_restart_required" # noqa: E501 + "robot_server.service.legacy.routers.settings.advanced_settings.is_restart_required" ) as p: yield p diff --git a/robot-server/tests/service/session/test_router.py b/robot-server/tests/service/session/test_router.py index 1ce6a94d61d..39008cb26e1 100644 --- a/robot-server/tests/service/session/test_router.py +++ b/robot-server/tests/service/session/test_router.py @@ -116,7 +116,7 @@ def test_sessions_create(sessions_api_client, mock_session_manager, mock_session }, "links": { "commandExecute": { - "href": f"/sessions/{mock_session.meta.identifier}/commands/execute", # noqa: E501 + "href": f"/sessions/{mock_session.meta.identifier}/commands/execute", "meta": None, }, "self": { @@ -222,7 +222,7 @@ def test_sessions_get(sessions_api_client, mock_session_manager, mock_session): }, "links": { "commandExecute": { - "href": f"/sessions/{mock_session.meta.identifier}/commands/execute", # noqa: E501 + "href": f"/sessions/{mock_session.meta.identifier}/commands/execute", "meta": None, }, "self": { @@ -285,7 +285,7 @@ def test_sessions_execute_command_no_session(sessions_api_client, mock_session_m { "id": "UncategorizedError", "title": "Resource Not Found", - "detail": "Resource type 'session' with id '1234' was not found", # noqa: E501 + "detail": "Resource type 'session' with id '1234' was not found", } ], "links": { @@ -333,7 +333,7 @@ def test_sessions_execute_command( }, "links": { "commandExecute": { - "href": f"/sessions/{mock_session.meta.identifier}/commands/execute", # noqa: E501 + "href": f"/sessions/{mock_session.meta.identifier}/commands/execute", "meta": None, }, "self": { diff --git a/shared-data/python/.flake8 b/shared-data/python/.flake8 index 0dcea8428ae..b7e63c7be41 100644 --- a/shared-data/python/.flake8 +++ b/shared-data/python/.flake8 @@ -1,15 +1,14 @@ [flake8] -# set line-length for future black support -# https://github.com/psf/black/blob/master/docs/compatible_configs.md -max-line-length = 88 - # max cyclomatic complexity max-complexity = 9 extend-ignore = - # ignore E203 because black might reformat it + # defer formatting concerns to black + # E203: space around `:` operator + # E501: maximum line length E203, + E501, # do not require type annotations for self nor cls ANN101, ANN102 diff --git a/update-server/.flake8 b/update-server/.flake8 index a5b22ed6f94..8b55f83cbde 100644 --- a/update-server/.flake8 +++ b/update-server/.flake8 @@ -1,15 +1,14 @@ [flake8] -# set line-length for future black support -# https://github.com/psf/black/blob/master/docs/compatible_configs.md -max-line-length = 88 - # max cyclomatic complexity max-complexity = 9 extend-ignore = - # ignore E203 because black might reformat it + # defer formatting concerns to black + # E203: space around `:` operator + # E501: maximum line length E203, + E501, # do not require type annotations for self nor cls ANN101, ANN102