Skip to content

Commit 71bfaf6

Browse files
authored
fix(shared-data): evotips v1 are schema 2 now (#17428)
We had the evotips labware and adapter as schema 3 labware. This was probably necessary while this was a 3-element stack, but now it is not, and we need to avoid shipping schema 3 labware in 8.3 so that we retain the ability to change it. Closes EXEC-1179 ## review - seem fine? ## testing - smoke test. nothing checks schema identity, just whether data is there, and all the data that the code in 8.3 uses is still there.
1 parent 30f65d9 commit 71bfaf6

File tree

8 files changed

+1109
-26
lines changed

8 files changed

+1109
-26
lines changed

api/tests/opentrons/protocol_engine/commands/test_evotip_dispense.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
"""Test evotip dispense in place commands."""
2-
import json
32

43
import pytest
54
from decoy import Decoy
@@ -28,19 +27,15 @@
2827
from opentrons.protocol_engine.state.state import StateView
2928
from opentrons.protocol_engine.state import update_types
3029

31-
from opentrons_shared_data import load_shared_data
30+
from opentrons_shared_data.labware import load_definition
3231

3332

3433
@pytest.fixture
3534
def evotips_definition() -> LabwareDefinition:
3635
"""A fixturee of the evotips definition."""
3736
# TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
3837
return LabwareDefinition.model_validate(
39-
json.loads(
40-
load_shared_data(
41-
"labware/definitions/3/evotips_opentrons_96_labware/1.json"
42-
)
43-
)
38+
load_definition("evotips_opentrons_96_labware", 1)
4439
)
4540

4641

api/tests/opentrons/protocol_engine/commands/test_evotip_seal_pipette.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,16 @@
3636
PipettingHandler,
3737
)
3838
from opentrons.hardware_control import HardwareControlAPI
39-
import json
40-
from opentrons_shared_data import load_shared_data
39+
40+
from opentrons_shared_data.labware import load_definition
4141

4242

4343
@pytest.fixture
4444
def evotips_definition() -> LabwareDefinition:
4545
"""A fixturee of the evotips definition."""
4646
# TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
4747
return LabwareDefinition.model_validate(
48-
json.loads(
49-
load_shared_data(
50-
"labware/definitions/3/evotips_opentrons_96_labware/1.json"
51-
)
52-
)
48+
load_definition("evotips_opentrons_96_labware", 1)
5349
)
5450

5551

api/tests/opentrons/protocol_engine/commands/test_evotip_unseal_pipette.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
from opentrons.protocol_engine.state.state import StateView
2828
from opentrons.protocol_engine.execution import MovementHandler, GantryMover, TipHandler
2929
from opentrons.protocols.models import LabwareDefinition
30-
import json
31-
from opentrons_shared_data import load_shared_data
30+
31+
from opentrons_shared_data.labware import load_definition
3232

3333
from opentrons.types import Point
3434

@@ -89,11 +89,7 @@ def evotips_definition() -> LabwareDefinition:
8989
"""A fixturee of the evotips definition."""
9090
# TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
9191
return LabwareDefinition.model_validate(
92-
json.loads(
93-
load_shared_data(
94-
"labware/definitions/3/evotips_opentrons_96_labware/1.json"
95-
)
96-
)
92+
load_definition("evotips_opentrons_96_labware", 1)
9793
)
9894

9995

shared-data/js/labware.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ import thermoscientificnunc96Wellplate2000UlV1Uncasted from '../labware/definiti
121121
import tipone96Tiprack200UlV1Uncasted from '../labware/definitions/2/tipone_96_tiprack_200ul/1.json'
122122
import usascientific12Reservoir22MlV1Uncasted from '../labware/definitions/2/usascientific_12_reservoir_22ml/1.json'
123123
import usascientific96Wellplate24MlDeepV1Uncasted from '../labware/definitions/2/usascientific_96_wellplate_2.4ml_deep/1.json'
124-
import evotipsFlex96TiprackAdapterV1Uncasted from '../labware/definitions/3/evotips_flex_96_tiprack_adapter/1.json'
125-
import evotipsOpentrons96LabwareV1Uncasted from '../labware/definitions/3/evotips_opentrons_96_labware/1.json'
124+
import evotipsFlex96TiprackAdapterV1Uncasted from '../labware/definitions/2/evotips_flex_96_tiprack_adapter/1.json'
125+
import evotipsOpentrons96LabwareV1Uncasted from '../labware/definitions/2/evotips_opentrons_96_labware/1.json'
126126

127127
// v1 legacy labware definitions
128128

@@ -473,6 +473,7 @@ const latestDefs = {
473473
evotipsFlex96TiprackAdapterV1,
474474
evotipsOpentrons96LabwareV1,
475475
}
476+
476477
// labware definitions
477478
const getAllLabwareDefs = (): Record<
478479
keyof typeof latestDefs,
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"ordering": [],
3+
"brand": {
4+
"brand": "Opentrons",
5+
"brandId": []
6+
},
7+
"metadata": {
8+
"displayName": "Evotips adapter",
9+
"displayCategory": "adapter",
10+
"displayVolumeUnits": "\u00b5L",
11+
"tags": []
12+
},
13+
"dimensions": {
14+
"xDimension": 156.5,
15+
"yDimension": 105,
16+
"zDimension": 132
17+
},
18+
"wells": {},
19+
"groups": [
20+
{
21+
"metadata": {},
22+
"wells": []
23+
}
24+
],
25+
"parameters": {
26+
"format": "96Standard",
27+
"quirks": ["tiprackAdapterFor96Channel", "stackingMaxFive"],
28+
"isTiprack": false,
29+
"isMagneticModuleCompatible": false,
30+
"loadName": "evotips_flex_96_tiprack_adapter"
31+
},
32+
"namespace": "opentrons",
33+
"version": 1,
34+
"schemaVersion": 2,
35+
"allowedRoles": ["adapter"],
36+
"cornerOffsetFromSlot": {
37+
"x": -14.25,
38+
"y": -3.5,
39+
"z": 0
40+
}
41+
}

0 commit comments

Comments
 (0)