Skip to content

Commit

Permalink
fix: format, lint and typo
Browse files Browse the repository at this point in the history
  • Loading branch information
Laura-Danielle committed Feb 20, 2024
1 parent 3099ca7 commit 2b89518
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion api/src/opentrons/protocol_engine/execution/equipment.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ async def load_pipette(
return LoadedPipetteData(
pipette_id=pipette_id,
serial_number=serial,
static_config=static_pipette_config
static_config=static_pipette_config,
)

async def load_magnetic_block(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
)

from ..types import FlowRates
from ...types import Point


@dataclass(frozen=True)
Expand Down Expand Up @@ -172,7 +171,7 @@ def _get_virtual_pipette_static_config_by_model(
nominal_tip_overlap=config.liquid_properties[
liquid_class
].tip_overlap_dictionary,
nozzle_map=nozzle_manager.current_configuration
nozzle_map=nozzle_manager.current_configuration,
)

def get_virtual_pipette_static_config(
Expand Down Expand Up @@ -206,5 +205,5 @@ def get_pipette_static_config(pipette_dict: PipetteDict) -> LoadedStaticPipetteD
# https://opentrons.atlassian.net/browse/RCORE-655
home_position=0,
nozzle_offset_z=0,
nozzle_map=pipette_dict["current_nozzle_map"]
nozzle_map=pipette_dict["current_nozzle_map"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from opentrons_shared_data.pipette.dev_types import PipetteNameType
from ..pipette_fixtures import get_default_nozzle_map


async def test_configure_for_volume_implementation(
decoy: Decoy,
equipment: EquipmentHandler,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from opentrons_shared_data.pipette.dev_types import PipetteNameType
from opentrons_shared_data.robot.dev_types import RobotType
from opentrons.types import MountType, Point
from opentrons.types import MountType

from opentrons.protocol_engine.errors import InvalidSpecificationForRobotTypeError
from opentrons.protocol_engine.types import FlowRates
Expand All @@ -19,9 +19,9 @@
LoadPipettePrivateResult,
LoadPipetteImplementation,
)
from opentrons_shared_data.pipette.dev_types import PipetteNameType
from ..pipette_fixtures import get_default_nozzle_map


async def test_load_pipette_implementation(
decoy: Decoy,
equipment: EquipmentHandler,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from opentrons_shared_data.labware.dev_types import LabwareUri

from opentrons.calibration_storage.helpers import uri_from_details
from opentrons.types import Mount as HwMount, MountType, DeckSlotName, Point
from opentrons.types import Mount as HwMount, MountType, DeckSlotName
from opentrons.hardware_control import HardwareControlAPI
from opentrons.hardware_control.modules import (
TempDeck,
Expand Down Expand Up @@ -56,7 +56,6 @@
LoadedPipetteData,
LoadedModuleData,
)
from opentrons_shared_data.pipette.dev_types import PipetteNameType
from ..pipette_fixtures import get_default_nozzle_map


Expand Down Expand Up @@ -149,7 +148,7 @@ def loaded_static_pipette_data(
nominal_tip_overlap={"default": 9.87},
home_position=10.11,
nozzle_offset_z=12.13,
nozzle_map=get_default_nozzle_map(PipetteNameType.P300_SINGLE)
nozzle_map=get_default_nozzle_map(PipetteNameType.P300_SINGLE),
)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
"""Test pipette data provider."""
from collections import OrderedDict

import pytest
from opentrons_shared_data.pipette.dev_types import PipetteNameType, PipetteModel
from opentrons_shared_data.pipette import pipette_definition, types as pip_types
Expand All @@ -13,7 +11,6 @@
)

from opentrons.protocol_engine.resources import pipette_data_provider as subject
from opentrons_shared_data.pipette.dev_types import PipetteNameType
from ..pipette_fixtures import get_default_nozzle_map


Expand Down Expand Up @@ -175,7 +172,7 @@ def test_get_pipette_static_config(
supported_tip_fixture: pipette_definition.SupportedTipsDefinition,
) -> None:
"""It should return config data given a PipetteDict."""
dummy_nozzle_map = get_default_nozzle_map(PipetteNameType.P300_SINGLE_GEN2),
dummy_nozzle_map = get_default_nozzle_map(PipetteNameType.P300_SINGLE_GEN2)
pipette_dict: PipetteDict = {
"name": "p300_single_gen2",
"min_volume": 20,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
create_move_relative_command,
create_prepare_to_aspirate_command,
)
from opentrons_shared_data.pipette.dev_types import PipetteNameType
from ..pipette_fixtures import get_default_nozzle_map


@pytest.fixture
def subject() -> PipetteStore:
"""Get a PipetteStore test subject for all subsequent tests."""
Expand Down Expand Up @@ -683,7 +683,7 @@ def test_add_pipette_config(
nominal_tip_overlap={"default": 5},
home_position=8.9,
nozzle_offset_z=10.11,
nozzle_map=get_default_nozzle_map(PipetteNameType.P300_SINGLE)
nozzle_map=get_default_nozzle_map(PipetteNameType.P300_SINGLE),
),
)
subject.handle_action(
Expand All @@ -703,7 +703,7 @@ def test_add_pipette_config(
nozzle_offset_z=10.11,
bounding_nozzle_offsets=BoundingNozzlesOffsets(
back_left_offset=Point(x=0, y=0, z=0),
front_right_offset=Point(x=0, y=0, z=0)
front_right_offset=Point(x=0, y=0, z=0),
),
)
assert subject.state.flow_rates_by_id["pipette-id"].default_aspirate == {"a": 1.0}
Expand Down

0 comments on commit 2b89518

Please sign in to comment.