Skip to content

Commit dd82c32

Browse files
authored
chore: new names for evo labware (#18079)
Remove the external branding from our resin tips labware. The new names follow the format `ev_resin_tips_...`. Update the - definitions - including stacking overlaps - blocklists - test fixtures - image bindings in lablib - image bindings in app labware tab ## screenshots ### lablib ![top-lablib](https://github.com/user-attachments/assets/8abcdcbd-b39f-424a-a69b-de0ae7bcb26f) ![tall-lablib](https://github.com/user-attachments/assets/f7c0ec6f-4677-4a5e-b5a1-f31076dbb4ef) ![short-lablib](https://github.com/user-attachments/assets/e5f1881b-6234-4b51-9b7c-c418ed172ef3) ![tall-with-tiprack-lablib](https://github.com/user-attachments/assets/f399123b-77b6-465e-8ea3-30476702732c) ### app ![top-app-slideout](https://github.com/user-attachments/assets/d4e51c72-8d7e-45b3-97b6-d73d24f303a0) ![tall-tiprack-app-slideout](https://github.com/user-attachments/assets/22962709-2cf2-4955-b669-498e00d7e2fb) ![tall-app-slideout](https://github.com/user-attachments/assets/f979b64f-fa3e-44d2-a3dd-b0f12e3f5d9d) ![short-app-slideout](https://github.com/user-attachments/assets/3c178c1e-d4fd-4489-ab8e-17fd28cc5964) ![top-app-summary](https://github.com/user-attachments/assets/52c45123-aede-4621-a53c-e0b26f6841bd) ![tall-tiprack-app-summary](https://github.com/user-attachments/assets/17b0b99c-16a9-43d1-8133-7535d180c9d5) ![tall-app-summary](https://github.com/user-attachments/assets/02944a95-ec98-43c2-a337-1b8dd1fad2d6) ![short-app-summary](https://github.com/user-attachments/assets/51e2ec42-ac6f-4bc5-bb38-952d620a8811) ### simulation Simulates ok with the ABR protocol after fixes (change the names, remove the soak plate) ## review - did i miss any bits
1 parent 7d7af1c commit dd82c32

File tree

18 files changed

+38
-43
lines changed

18 files changed

+38
-43
lines changed

Diff for: api/tests/opentrons/protocol_api/core/engine/test_load_labware_params.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ def test_default_labware_version_dependent_on_api_version(
131131
"nest_96_wellplate_2ml_deep",
132132
"opentrons_96_wellplate_200ul_pcr_full_skirt",
133133
"biorad_96_wellplate_200ul_pcr",
134-
"evotips_opentrons_96_labware",
135-
"evotips_flex_96_tiprack_adapter",
134+
"ev_resin_tips_flex_96_labware",
135+
"ev_resin_tips_flex_96_tiprack_adapter",
136136
],
137137
)
138138
@pytest.mark.parametrize("namespace", [OPENTRONS_NAMESPACE, None])

Diff for: api/tests/opentrons/protocol_engine/commands/test_pressure_dispense.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def evotips_definition() -> LabwareDefinition:
3838
"""A fixturee of the evotips definition."""
3939
# TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
4040
return labware_definition_type_adapter.validate_python(
41-
load_definition("evotip_flex_96_labware", 1)
41+
load_definition("ev_resin_tips_flex_96_labware", 1)
4242
)
4343

4444

Diff for: api/tests/opentrons/protocol_engine/commands/test_seal_pipette_to_tip.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def evotips_definition() -> LabwareDefinition:
4848
"""A fixturee of the evotips definition."""
4949
# TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
5050
return labware_definition_type_adapter.validate_python(
51-
load_definition("evotip_flex_96_labware", 1)
51+
load_definition("ev_resin_tips_flex_96_labware", 1)
5252
)
5353

5454

Diff for: api/tests/opentrons/protocol_engine/commands/test_unseal_pipette_from_tip.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def evotips_definition() -> LabwareDefinition:
9292
"""A fixturee of the evotips definition."""
9393
# TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
9494
return labware_definition_type_adapter.validate_python(
95-
load_definition("evotip_flex_96_labware", 1)
95+
load_definition("ev_resin_tips_flex_96_labware", 1)
9696
)
9797

9898

Diff for: app/src/local-resources/labware/hooks/useAllLabware.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@ import { getValidCustomLabware } from '/app/redux/custom-labware'
33
import { getAllDefinitions } from '../utils'
44
import type { LabwareSort, LabwareFilter, LabwareDefAndDate } from '../types'
55

6-
// labware to filter out from the labware tab of the desktop app
7-
// TODO (sb:1/14/25) remove evotips from blocklist before public launch
8-
const LABWARE_LOADNAME_BLOCKLIST = [
9-
'evotips_flex_96_tiprack_adapter',
10-
'evotips_opentrons_96_labware',
11-
'evotips_tiprack_adapter',
12-
'evotips_reservoir_adapter',
13-
]
6+
const LABWARE_LOADNAME_BLOCKLIST: string[] = []
147

158
export function useAllLabware(
169
sortBy: LabwareSort,

Diff for: app/src/organisms/Desktop/Labware/LabwareDetails/labware-images.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ import flat_bottom_aluminum from '/app/assets/images/labware/flat_bottom_aluminu
6060
import opentrons_96_aluminumblock_side_view from '/app/assets/images/labware/opentrons_96_aluminumblock_side_view.jpg'
6161
import opentrons_96_deep_well_temp_mod_adapter_img from '/app/assets/images/labware/opentrons_96_deep_well_temp_mod_adapter.png'
6262
import opentrons_flex_deck_riser_img from '/app/assets/images/labware/opentrons_flex_deck_riser.png'
63-
import opentrons_evotip_short_adapter_img from '/app/assets/images/labware/opentrons_evotip_short_adapter.png'
64-
import opentrons_evotip_tall_adapter_img from '/app/assets/images/labware/opentrons_evotip_tall_adapter.png'
63+
import ev_resin_tips_flex_short_adapter_img from '/app/assets/images/labware/ev_resin_tips_flex_short_adapter.png'
64+
import ev_resin_tips_flex_tall_adapter_img from '/app/assets/images/labware/ev_resin_tips_flex_tall_adapter.png'
6565

6666
export const labwareImages: Record<string, string[]> = {
6767
agilent_1_reservoir_290ml: [agilent_1_reservoir_290ml_side_view],
@@ -259,6 +259,6 @@ export const labwareImages: Record<string, string[]> = {
259259
opentrons_96_deep_well_temp_mod_adapter_img,
260260
],
261261
opentrons_flex_deck_riser: [opentrons_flex_deck_riser_img],
262-
evotip_flex_tall_adapter: [opentrons_evotip_short_adapter_img],
263-
evotip_flex_short_adapter: [opentrons_evotip_tall_adapter_img],
262+
ev_resin_tips_flex_short_adapter: [ev_resin_tips_flex_short_adapter_img],
263+
ev_resin_tips_flex_tall_adapter: [ev_resin_tips_flex_tall_adapter_img],
264264
}

Diff for: app/src/organisms/ODD/QuickTransferFlow/constants.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const DEFAULT_MM_BLOWOUT_OFFSET_FROM_TOP = 0
3535

3636
// this list is manually maintained
3737
export const QUICK_TRANSFER_INCOMPATIBLE_LABWARE = [
38-
'opentrons/evotip_flex_96_labware/1',
38+
'opentrons/ev_resin_tips_flex_96_labware/1',
3939
]
4040

4141
// these lists are generated by the util generateCompatibleLabwareForPipette in ./utils

Diff for: labware-library/src/components/labware-ui/labware-images.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -477,12 +477,14 @@ export const labwareImages: Record<string, string[]> = {
477477
opentrons_flex_deck_riser: [
478478
new URL('../../images/opentrons_flex_deck_riser.png', import.meta.url).href,
479479
],
480-
evotip_flex_tall_adapter: [
481-
new URL('../../images/opentrons_evotip_tall_adapter.png', import.meta.url)
480+
ev_resin_tips_flex_tall_adapter: [
481+
new URL('../../images/ev_resin_tips_flex_tall_adapter.png', import.meta.url)
482482
.href,
483483
],
484-
evotip_flex_short_adapter: [
485-
new URL('../../images/opentrons_evotip_short_adapter.png', import.meta.url)
486-
.href,
484+
ev_resin_tips_flex_short_adapter: [
485+
new URL(
486+
'../../images/ev_resin_tips_flex_short_adapter.png',
487+
import.meta.url
488+
).href,
487489
],
488490
}

Diff for: shared-data/js/__tests__/labwareDefSchemaV2.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const expectedWellsNotMatchingZDimension: Record<string, Set<string>> = {
130130
'opentrons_calibrationblock_short_side_right/1.json': new Set(['A2']),
131131

132132
// this labware has a lip
133-
'evotip_flex_96_labware/1.json': standard96WellNames,
133+
'ev_resin_tips_flex_96_labware/1.json': standard96WellNames,
134134

135135
// Presumably a bug. Fixed in v3 of this labware.
136136
'nest_1_reservoir_195ml/1.json': new Set(['A1']),

Diff for: shared-data/js/getLabware.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ export const PD_DO_NOT_LIST = [
7171
'opentrons_tough_pcr_auto_sealing_lid',
7272
'opentrons_flex_deck_riser',
7373
// evotip is not supported in PD
74-
'evotip_flex_96_tiprack_adapter',
75-
'evotip_flex_96_labware',
76-
'evotip_flex_tall_adapter',
77-
'evotip_flex_short_adapter',
74+
'ev_resin_tips_flex_96_tiprack_adapter',
75+
'ev_resin_tips_flex_96_labware',
76+
'ev_resin_tips_flex_tall_adapter',
77+
'ev_resin_tips_flex_short_adapter',
7878
// temporarily blocking tiprack lids until stacker launches
7979
'opentrons_flex_tiprack_lid',
8080
// temporarily blocking 20 uL Flex tip racks until they launch

Diff for: shared-data/labware/definitions/2/evotip_flex_96_labware/1.json renamed to shared-data/labware/definitions/2/ev_resin_tips_flex_96_labware/1.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"brand": "opentrons",
1818
"brandId": ["999-00254"],
1919
"links": [
20-
"https://opentrons.com/products/opentrons-flex-evotip-adapter-set/"
20+
"https://opentrons.com/products/opentrons-flex-adapter-set-for-3rd-party-evotips/"
2121
]
2222
},
2323
"metadata": {
24-
"displayName": "Evotip Labware in Opentrons Flex Top Adapter",
24+
"displayName": "Opentrons Flex EV Resin Tips Top Adapter with Third-party Evotips",
2525
"displayCategory": "wellPlate",
2626
"displayVolumeUnits": "µL",
2727
"tags": []
@@ -1009,7 +1009,7 @@
10091009
"tipLength": 51.0,
10101010
"tipOverlap": 10.0,
10111011
"isMagneticModuleCompatible": false,
1012-
"loadName": "evotip_flex_96_labware"
1012+
"loadName": "ev_resin_tips_flex_96_labware"
10131013
},
10141014
"namespace": "opentrons",
10151015
"allowedRoles": ["labware"],
@@ -1048,17 +1048,17 @@
10481048
"y": 0,
10491049
"z": 22.5
10501050
},
1051-
"evotip_flex_short_adapter": {
1051+
"ev_resin_tips_flex_short_adapter": {
10521052
"x": 0,
10531053
"y": 0,
10541054
"z": 18.5
10551055
},
1056-
"evotip_flex_96_tiprack_adapter": {
1056+
"ev_resin_tips_flex_96_tiprack_adapter": {
10571057
"x": 0,
10581058
"y": 0,
10591059
"z": 71.78
10601060
},
1061-
"evotip_flex_tall_adapter": {
1061+
"ev_resin_tips_flex_tall_adapter": {
10621062
"x": 0,
10631063
"y": 0,
10641064
"z": 18.5

Diff for: shared-data/labware/definitions/2/evotip_flex_96_tiprack_adapter/1.json renamed to shared-data/labware/definitions/2/ev_resin_tips_flex_96_tiprack_adapter/1.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"brand": "Opentrons",
55
"brandId": ["999-00254"],
66
"links": [
7-
"https://opentrons.com/products/opentrons-flex-evotip-adapter-set/"
7+
"https://opentrons.com/products/opentrons-flex-adapter-set-for-3rd-party-evotips/"
88
]
99
},
1010
"metadata": {
11-
"displayName": "Opentrons Flex Evotip Tiprack 96-Channel Adapter",
11+
"displayName": "Opentrons Flex EV Resin Tips Tall Adapter for Third-party Evotips in Flex 96 Tip Rack Adapter",
1212
"displayCategory": "adapter",
1313
"displayVolumeUnits": "µL",
1414
"tags": []
@@ -30,7 +30,7 @@
3030
"quirks": ["tiprackAdapterFor96Channel", "stackingMaxFive"],
3131
"isTiprack": false,
3232
"isMagneticModuleCompatible": false,
33-
"loadName": "evotip_flex_96_tiprack_adapter"
33+
"loadName": "ev_resin_tips_flex_96_tiprack_adapter"
3434
},
3535
"namespace": "opentrons",
3636
"version": 1,

Diff for: shared-data/labware/definitions/2/evotip_flex_short_adapter/1.json renamed to shared-data/labware/definitions/2/ev_resin_tips_flex_short_adapter/1.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"brand": "Opentrons",
55
"brandId": ["999-00254"],
66
"links": [
7-
"https://opentrons.com/products/opentrons-flex-evotip-adapter-set/"
7+
"https://opentrons.com/products/opentrons-flex-adapter-set-for-3rd-party-evotips/"
88
]
99
},
1010
"metadata": {
11-
"displayName": "Opentrons Flex Evotip Short Adapter",
11+
"displayName": "Opentrons Flex EV Resin Tips Short Adapter for Third-party Evotips",
1212
"displayCategory": "adapter",
1313
"displayVolumeUnits": "µL",
1414
"tags": []
@@ -30,7 +30,7 @@
3030
"quirks": ["stackingMaxFive"],
3131
"isTiprack": false,
3232
"isMagneticModuleCompatible": false,
33-
"loadName": "evotip_flex_short_adapter"
33+
"loadName": "ev_resin_tips_flex_short_adapter"
3434
},
3535
"namespace": "opentrons",
3636
"version": 1,

Diff for: shared-data/labware/definitions/2/evotip_flex_tall_adapter/1.json renamed to shared-data/labware/definitions/2/ev_resin_tips_flex_tall_adapter/1.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"brand": "Opentrons",
55
"brandId": ["999-00254"],
66
"links": [
7-
"https://opentrons.com/products/opentrons-flex-evotip-adapter-set/"
7+
"https://opentrons.com/products/opentrons-flex-adapter-set-for-3rd-party-evotips/"
88
]
99
},
1010
"metadata": {
11-
"displayName": "Opentrons Flex Evotip Tall Adapter",
11+
"displayName": "Opentrons Flex EV Resin Tips Tall Adapter for Third-party Evotips",
1212
"displayCategory": "adapter",
1313
"displayVolumeUnits": "µL",
1414
"tags": []
@@ -30,7 +30,7 @@
3030
"quirks": ["stackingMaxFive"],
3131
"isTiprack": false,
3232
"isMagneticModuleCompatible": false,
33-
"loadName": "evotip_flex_tall_adapter"
33+
"loadName": "ev_resin_tips_flex_tall_adapter"
3434
},
3535
"namespace": "opentrons",
3636
"version": 1,

0 commit comments

Comments
 (0)