Skip to content

Commit 1400574

Browse files
committed
change multi_peek to multipeek since we do string logic that splits on _ in a few places
1 parent a313e65 commit 1400574

File tree

6 files changed

+9
-4
lines changed

6 files changed

+9
-4
lines changed

shared-data/python/opentrons_shared_data/pipette/load_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def load_serial_lookup_table() -> Dict[str, str]:
120120
"single_channel": "single",
121121
"ninety_six_channel": "96",
122122
"eight_channel": "multi",
123-
"eight_channel_peek": "multi_peek",
123+
"eight_channel_peek": "multipeek",
124124
}
125125
_model_shorthand = {"p1000": "p1k", "p300": "p3h"}
126126
for channel_dir in _dirs_in(config_path):

shared-data/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def channels_from_string(channels: str) -> PipetteChannelType:
8080
"""
8181
if channels == "96":
8282
return PipetteChannelType.NINETY_SIX_CHANNEL
83-
elif channels == "multi":
83+
elif "multi" in channels:
8484
return PipetteChannelType.EIGHT_CHANNEL
8585
elif channels == "single":
8686
return PipetteChannelType.SINGLE_CHANNEL

shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ def _update_all_models(configuration_to_update: List[str]) -> None:
355355
"single_channel": "single",
356356
"ninety_six_channel": "96",
357357
"eight_channel": "multi",
358+
"eight_channel_peek": "multipeek",
358359
}
359360

360361
for channel_dir in os.listdir(paths_to_validate):

shared-data/python/opentrons_shared_data/pipette/types.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def dict_for_encode(self) -> bool:
216216
"p1000_single_gen2",
217217
"p1000_single_flex",
218218
"p1000_multi_flex",
219-
"p1000_multi_peek",
219+
"p1000_multipeek",
220220
"p1000_96",
221221
"p200_96",
222222
]
@@ -243,7 +243,7 @@ class PipetteNameType(str, enum.Enum):
243243
P1000_SINGLE_GEN2 = "p1000_single_gen2"
244244
P1000_SINGLE_FLEX = "p1000_single_flex"
245245
P1000_MULTI_FLEX = "p1000_multi_flex"
246-
P1000_MULTI_PEEK = "p1000_multi_peek"
246+
P1000_MULTI_PEEK = "p1000_multipeek"
247247
P1000_96 = "p1000_96"
248248
P200_96 = "p200_96"
249249

shared-data/python/tests/pipette/test_max_flow_rates_per_volume.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def get_all_pipette_models() -> Iterator[PipetteModel]:
4949
"single_channel": "single",
5050
"ninety_six_channel": "96",
5151
"eight_channel": "multi",
52+
"eight_channel_peek": "multipeek",
5253
}
5354
assert os.listdir(paths_to_validate), "You have a path wrong"
5455
for channel_dir in os.listdir(paths_to_validate):

shared-data/python/tests/pipette/test_validate_schema.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def iterate_models() -> Iterator[PipetteModel]:
2222
"single_channel": "single",
2323
"ninety_six_channel": "96",
2424
"eight_channel": "multi",
25+
"eight_channel_peek": "multipeek",
2526
}
2627
defn_root = get_shared_data_root() / "pipette" / "definitions" / "2" / "liquid"
2728
assert os.listdir(defn_root), "A path is wrong"
@@ -63,6 +64,7 @@ def test_pick_up_configs_configuration_by_nozzle_map_keys() -> None:
6364
"single_channel": "single",
6465
"ninety_six_channel": "96",
6566
"eight_channel": "multi",
67+
"eight_channel_peek": "multipeek",
6668
}
6769
assert os.listdir(paths_to_validate), "You have a path wrong"
6870
for channel_dir in os.listdir(paths_to_validate):
@@ -105,6 +107,7 @@ def test_pick_up_configs_configuration_ordered_from_smallest_to_largest() -> Non
105107
"single_channel": "single",
106108
"ninety_six_channel": "96",
107109
"eight_channel": "multi",
110+
"eight_channel_peek": "multipeek",
108111
}
109112
assert os.listdir(paths_to_validate), "You have a path wrong"
110113
for channel_dir in os.listdir(paths_to_validate):

0 commit comments

Comments
 (0)