reverted LoadedStaticPipetteData default_push_out_volume - not needed…

… at the moment
Opentrons · Aug 25, 2023 · 55d0069 · 55d0069
1 parent ed7d647
commit 55d0069
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 14 deletions.
diff --git a/api/src/opentrons/protocol_engine/resources/pipette_data_provider.py b/api/src/opentrons/protocol_engine/resources/pipette_data_provider.py
@@ -1,6 +1,6 @@
 """Pipette config data providers."""
 from dataclasses import dataclass
-from typing import Dict, Optional
+from typing import Dict
 
 from opentrons_shared_data.pipette.dev_types import PipetteName
 from opentrons_shared_data.pipette import (
@@ -31,7 +31,6 @@ class LoadedStaticPipetteData:
         float, pipette_definition.SupportedTipsDefinition
     ]
     nominal_tip_overlap: Dict[str, float]
-    default_push_out_volume: Optional[float]
 
 
 def get_virtual_pipette_static_config(
@@ -71,7 +70,6 @@ def get_virtual_pipette_static_config(
         nominal_tip_overlap=config.liquid_properties[
             liquid_class
         ].tip_overlap_dictionary,
-        default_push_out_volume=tip_configuration.default_push_out_volume,
     )
 
 
@@ -96,7 +94,4 @@ def get_pipette_static_config(pipette_dict: PipetteDict) -> LoadedStaticPipetteD
         # https://opentrons.atlassian.net/browse/RCORE-655
         home_position=0,
         nozzle_offset_z=0,
-        default_push_out_volume=pipette_dict["default_push_out_volume"]
-        if "default_push_out_volume" in pipette_dict
-        else None,
     )
diff --git a/api/tests/opentrons/protocol_engine/execution/test_equipment_handler.py b/api/tests/opentrons/protocol_engine/execution/test_equipment_handler.py
@@ -146,7 +146,6 @@ def loaded_static_pipette_data(
         nominal_tip_overlap={"default": 9.87},
         home_position=10.11,
         nozzle_offset_z=12.13,
-        default_push_out_volume=5,
     )
 
 

diff --git a/api/tests/opentrons/protocol_engine/resources/test_pipette_data_provider.py b/api/tests/opentrons/protocol_engine/resources/test_pipette_data_provider.py
@@ -40,7 +40,6 @@ def test_get_virtual_pipette_static_config() -> None:
             "opentrons/opentrons_96_tiprack_10ul/1": 8.25,
             "opentrons/opentrons_96_tiprack_20ul/1": 8.25,
         },
-        default_push_out_volume=0,
     )
 
 
@@ -109,5 +108,4 @@ def test_get_pipette_static_config(
         # https://opentrons.atlassian.net/browse/RCORE-655
         nozzle_offset_z=0,
         home_position=0,
-        default_push_out_volume=3,
     )
diff --git a/api/tests/opentrons/protocol_engine/state/test_pipette_store.py b/api/tests/opentrons/protocol_engine/state/test_pipette_store.py
@@ -614,7 +614,6 @@ def test_add_pipette_config(
                 nominal_tip_overlap={"default": 5},
                 home_position=8.9,
                 nozzle_offset_z=10.11,
-                default_push_out_volume=5,
             ),
         )
     )

diff --git a/api/tests/opentrons/protocol_engine/state/test_tip_state.py b/api/tests/opentrons/protocol_engine/state/test_tip_state.py
@@ -198,7 +198,6 @@ def test_get_next_tip_skips_picked_up_tip(
                 nominal_tip_overlap={},
                 nozzle_offset_z=1.23,
                 home_position=4.56,
-                default_push_out_volume=3,
             ),
         )
     )
@@ -256,7 +255,6 @@ def test_reset_tips(
                 nominal_tip_overlap={},
                 nozzle_offset_z=1.23,
                 home_position=4.56,
-                default_push_out_volume=3,
             ),
         )
     )
@@ -295,7 +293,6 @@ def test_handle_pipette_config_action(
                 nominal_tip_overlap={},
                 nozzle_offset_z=1.23,
                 home_position=4.56,
-                default_push_out_volume=3,
             ),
         )
     )
@@ -363,7 +360,6 @@ def test_drop_tip(
                 nominal_tip_overlap={},
                 nozzle_offset_z=1.23,
                 home_position=4.56,
-                default_push_out_volume=5,
             ),
         )
     )