Remove _gen3 pipette names.

Opentrons · Sep 11, 2023 · d1e04b2 · d1e04b2
1 parent 124f184
commit d1e04b2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/api/src/opentrons/protocol_api/validation.py b/api/src/opentrons/protocol_api/validation.py
@@ -41,13 +41,9 @@
 
 # Mapping of user-facing pipette names to names used by the internal Opentrons system
 _FLEX_PIPETTE_NAMES_MAP = {
-    "p50_single_gen3": "p50_single_flex",
     "flex_1channel_50": "p50_single_flex",
-    "p50_multi_gen3": "p50_multi_flex",
     "flex_8channel_50": "p50_multi_flex",
-    "p1000_single_gen3": "p1000_single_flex",
     "flex_1channel_1000": "p1000_single_flex",
-    "p1000_multi_gen3": "p1000_multi_flex",
     "flex_8channel_1000": "p1000_multi_flex",
     "flex_96channel_1000": "p1000_96",
 }
@@ -110,11 +106,6 @@ def ensure_pipette_name(pipette_name: str) -> PipetteNameType:
 
     try:
         if pipette_name in _FLEX_PIPETTE_NAMES_MAP.keys():
-            # TODO (spp: 2023-07-11): !!! VERY IMPORTANT!!!
-            #  We DO NOT want to support the old 'gen3' suffixed names for Flex launch.
-            #  This provision to accept the old names is added only for maintaining
-            #  backwards compatibility during internal testing and should be phased out.
-            #  So remove this name mapping and conversion at an appropriate time before launch
             checked_name = PipetteNameType(_FLEX_PIPETTE_NAMES_MAP[pipette_name])
         else:
             checked_name = PipetteNameType(pipette_name)

diff --git a/api/tests/opentrons/protocol_api/test_validation.py b/api/tests/opentrons/protocol_api/test_validation.py
@@ -67,10 +67,6 @@ def test_ensure_mount_input_invalid() -> None:
     [
         ("p300_single", PipetteNameType.P300_SINGLE),
         ("P300_muLTI_gen2", PipetteNameType.P300_MULTI_GEN2),
-        (
-            "p50_single_gen3",
-            PipetteNameType.P50_SINGLE_FLEX,
-        ),  # Remove this line once we phase out '_gen3' names
         ("flex_8channel_1000", PipetteNameType.P1000_MULTI_FLEX),
         ("flex_96channel_1000", PipetteNameType.P1000_96),
     ],