File tree Expand file tree Collapse file tree 8 files changed +1109
-26
lines changed
api/tests/opentrons/protocol_engine/commands
evotips_flex_96_tiprack_adapter
evotips_opentrons_96_labware
evotips_flex_96_tiprack_adapter
evotips_opentrons_96_labware Expand file tree Collapse file tree 8 files changed +1109
-26
lines changed Original file line number Diff line number Diff line change 1
1
"""Test evotip dispense in place commands."""
2
- import json
3
2
4
3
import pytest
5
4
from decoy import Decoy
28
27
from opentrons .protocol_engine .state .state import StateView
29
28
from opentrons .protocol_engine .state import update_types
30
29
31
- from opentrons_shared_data import load_shared_data
30
+ from opentrons_shared_data . labware import load_definition
32
31
33
32
34
33
@pytest .fixture
35
34
def evotips_definition () -> LabwareDefinition :
36
35
"""A fixturee of the evotips definition."""
37
36
# TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
38
37
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 )
44
39
)
45
40
46
41
Original file line number Diff line number Diff line change 36
36
PipettingHandler ,
37
37
)
38
38
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
41
41
42
42
43
43
@pytest .fixture
44
44
def evotips_definition () -> LabwareDefinition :
45
45
"""A fixturee of the evotips definition."""
46
46
# TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
47
47
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 )
53
49
)
54
50
55
51
Original file line number Diff line number Diff line change 27
27
from opentrons .protocol_engine .state .state import StateView
28
28
from opentrons .protocol_engine .execution import MovementHandler , GantryMover , TipHandler
29
29
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
32
32
33
33
from opentrons .types import Point
34
34
@@ -89,11 +89,7 @@ def evotips_definition() -> LabwareDefinition:
89
89
"""A fixturee of the evotips definition."""
90
90
# TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
91
91
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 )
97
93
)
98
94
99
95
Original file line number Diff line number Diff line change @@ -121,8 +121,8 @@ import thermoscientificnunc96Wellplate2000UlV1Uncasted from '../labware/definiti
121
121
import tipone96Tiprack200UlV1Uncasted from '../labware/definitions/2/tipone_96_tiprack_200ul/1.json'
122
122
import usascientific12Reservoir22MlV1Uncasted from '../labware/definitions/2/usascientific_12_reservoir_22ml/1.json'
123
123
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'
126
126
127
127
// v1 legacy labware definitions
128
128
@@ -473,6 +473,7 @@ const latestDefs = {
473
473
evotipsFlex96TiprackAdapterV1,
474
474
evotipsOpentrons96LabwareV1,
475
475
}
476
+
476
477
// labware definitions
477
478
const getAllLabwareDefs = ( ) : Record <
478
479
keyof typeof latestDefs ,
Original file line number Diff line number Diff line change
1
+ {
2
+ "ordering" : [],
3
+ "brand" : {
4
+ "brand" : " Opentrons" ,
5
+ "brandId" : []
6
+ },
7
+ "metadata" : {
8
+ "displayName" : " Evotips adapter" ,
9
+ "displayCategory" : " adapter" ,
10
+ "displayVolumeUnits" : " \u00b5 L" ,
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
+ }
You can’t perform that action at this time.
0 commit comments