fixup cherry-pick

Opentrons · Dec 20, 2024 · 27b24e2 · 27b24e2
1 parent fe0fc7d
commit 27b24e2
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 13 deletions.
diff --git a/api/tests/opentrons/hardware_control/backends/test_ot3_controller.py b/api/tests/opentrons/hardware_control/backends/test_ot3_controller.py
@@ -1434,7 +1434,7 @@ async def test_pressure_disable(
     mock_check_overpressure: None,
     pipette_has_sensor: bool,
 ) -> None:
-    config = {"run.side_effect": move_group_run_side_effect(controller, axes)}
+    config = {"run.side_effect": move_group_run_side_effect_home(controller, axes)}
     with mock.patch(  # type: ignore [call-overload]
         "opentrons.hardware_control.backends.ot3controller.MoveGroupRunner",
         spec=MoveGroupRunner,

diff --git a/api/tests/opentrons/protocol_engine/state/test_tip_state.py b/api/tests/opentrons/protocol_engine/state/test_tip_state.py
@@ -35,12 +35,6 @@
 _tip_rack_parameters = LabwareParameters.model_construct(isTiprack=True)  # type: ignore[call-arg]
 
 
-@pytest.fixture
-def available_sensors() -> AvailableSensorDefinition:
-    """Provide a list of sensors."""
-    return AvailableSensorDefinition(sensors=["pressure", "capacitive", "environment"])
-
-
 @pytest.fixture
 def available_sensors() -> AvailableSensorDefinition:
     """Provide a list of sensors."""

diff --git a/shared-data/python/opentrons_shared_data/pipette/model_constants.py b/shared-data/python/opentrons_shared_data/pipette/model_constants.py
@@ -20,7 +20,6 @@
     PipetteGenerationType.FLEX: {
         PipetteChannelType.SINGLE_CHANNEL: RobotMountConfigs(2133.33, 230.15, 80),
         PipetteChannelType.EIGHT_CHANNEL: RobotMountConfigs(2133.33, 230.15, 80),
-        PipetteChannelType.EIGHT_CHANNEL_EM: RobotMountConfigs(2133.33, 230.15, 80),
         PipetteChannelType.NINETY_SIX_CHANNEL: RobotMountConfigs(2133.33, 230.15, 80),
     },
 }

diff --git a/shared-data/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py b/shared-data/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py
@@ -83,8 +83,6 @@ def channels_from_string(channels: str) -> PipetteChannelType:
     if channels == "96":
         return PipetteChannelType.NINETY_SIX_CHANNEL
     elif "multi" in channels:
-        if "em" in channels:
-            return PipetteChannelType.EIGHT_CHANNEL_EM
         return PipetteChannelType.EIGHT_CHANNEL
     elif channels == "single":
         return PipetteChannelType.SINGLE_CHANNEL

diff --git a/shared-data/python/opentrons_shared_data/pipette/types.py b/shared-data/python/opentrons_shared_data/pipette/types.py
@@ -49,16 +49,13 @@ def check_and_return_type(
 class PipetteChannelType(int, enum.Enum):
     SINGLE_CHANNEL = 1
     EIGHT_CHANNEL = 8
-    EIGHT_CHANNEL_EM = 82
     NINETY_SIX_CHANNEL = 96
 
     def __str__(self) -> str:
         if self.value == 96:
             return "96"
         elif self.value == 8:
             return "multi"
-        elif self.value == 82:
-            return "multi_em"
         else:
             return "single"
 

diff --git a/shared-data/python/tests/pipette/test_validate_schema.py b/shared-data/python/tests/pipette/test_validate_schema.py
@@ -159,6 +159,7 @@ def test_serializer() -> None:
         types.PipetteModelType.p1000,
         types.PipetteChannelType.NINETY_SIX_CHANNEL,
         types.PipetteVersionType(3, 3),
+        types.PipetteOEMType.OT,
     )
     quirk_0 = types.Quirks.pickupTipShake
     quirk_1 = types.Quirks.dropTipShake