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.
Opentrons · Feb 6, 2025 · 71bfaf6 · 71bfaf6
1 parent 30f65d9
commit 71bfaf6
Show file tree

Hide file tree

Showing 8 changed files with 1,109 additions and 26 deletions.
diff --git a/api/tests/opentrons/protocol_engine/commands/test_evotip_dispense.py b/api/tests/opentrons/protocol_engine/commands/test_evotip_dispense.py
@@ -1,5 +1,4 @@
 """Test evotip dispense in place commands."""
-import json
 
 import pytest
 from decoy import Decoy
@@ -28,19 +27,15 @@
 from opentrons.protocol_engine.state.state import StateView
 from opentrons.protocol_engine.state import update_types
 
-from opentrons_shared_data import load_shared_data
+from opentrons_shared_data.labware import load_definition
 
 
 @pytest.fixture
 def evotips_definition() -> LabwareDefinition:
     """A fixturee of the evotips definition."""
     # TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
     return LabwareDefinition.model_validate(
-        json.loads(
-            load_shared_data(
-                "labware/definitions/3/evotips_opentrons_96_labware/1.json"
-            )
-        )
+        load_definition("evotips_opentrons_96_labware", 1)
     )
 
 

diff --git a/api/tests/opentrons/protocol_engine/commands/test_evotip_seal_pipette.py b/api/tests/opentrons/protocol_engine/commands/test_evotip_seal_pipette.py
@@ -36,20 +36,16 @@
     PipettingHandler,
 )
 from opentrons.hardware_control import HardwareControlAPI
-import json
-from opentrons_shared_data import load_shared_data
+
+from opentrons_shared_data.labware import load_definition
 
 
 @pytest.fixture
 def evotips_definition() -> LabwareDefinition:
     """A fixturee of the evotips definition."""
     # TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
     return LabwareDefinition.model_validate(
-        json.loads(
-            load_shared_data(
-                "labware/definitions/3/evotips_opentrons_96_labware/1.json"
-            )
-        )
+        load_definition("evotips_opentrons_96_labware", 1)
     )
 
 

diff --git a/api/tests/opentrons/protocol_engine/commands/test_evotip_unseal_pipette.py b/api/tests/opentrons/protocol_engine/commands/test_evotip_unseal_pipette.py
@@ -27,8 +27,8 @@
 from opentrons.protocol_engine.state.state import StateView
 from opentrons.protocol_engine.execution import MovementHandler, GantryMover, TipHandler
 from opentrons.protocols.models import LabwareDefinition
-import json
-from opentrons_shared_data import load_shared_data
+
+from opentrons_shared_data.labware import load_definition
 
 from opentrons.types import Point
 
@@ -89,11 +89,7 @@ def evotips_definition() -> LabwareDefinition:
     """A fixturee of the evotips definition."""
     # TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
     return LabwareDefinition.model_validate(
-        json.loads(
-            load_shared_data(
-                "labware/definitions/3/evotips_opentrons_96_labware/1.json"
-            )
-        )
+        load_definition("evotips_opentrons_96_labware", 1)
     )
 
 

diff --git a/shared-data/js/labware.ts b/shared-data/js/labware.ts
@@ -121,8 +121,8 @@ import thermoscientificnunc96Wellplate2000UlV1Uncasted from '../labware/definiti
 import tipone96Tiprack200UlV1Uncasted from '../labware/definitions/2/tipone_96_tiprack_200ul/1.json'
 import usascientific12Reservoir22MlV1Uncasted from '../labware/definitions/2/usascientific_12_reservoir_22ml/1.json'
 import usascientific96Wellplate24MlDeepV1Uncasted from '../labware/definitions/2/usascientific_96_wellplate_2.4ml_deep/1.json'
-import evotipsFlex96TiprackAdapterV1Uncasted from '../labware/definitions/3/evotips_flex_96_tiprack_adapter/1.json'
-import evotipsOpentrons96LabwareV1Uncasted from '../labware/definitions/3/evotips_opentrons_96_labware/1.json'
+import evotipsFlex96TiprackAdapterV1Uncasted from '../labware/definitions/2/evotips_flex_96_tiprack_adapter/1.json'
+import evotipsOpentrons96LabwareV1Uncasted from '../labware/definitions/2/evotips_opentrons_96_labware/1.json'
 
 // v1 legacy labware definitions
 
@@ -473,6 +473,7 @@ const latestDefs = {
   evotipsFlex96TiprackAdapterV1,
   evotipsOpentrons96LabwareV1,
 }
+
 // labware definitions
 const getAllLabwareDefs = (): Record<
   keyof typeof latestDefs,

diff --git a/shared-data/labware/definitions/2/evotips_flex_96_tiprack_adapter/1.json b/shared-data/labware/definitions/2/evotips_flex_96_tiprack_adapter/1.json
@@ -0,0 +1,41 @@
+{
+  "ordering": [],
+  "brand": {
+    "brand": "Opentrons",
+    "brandId": []
+  },
+  "metadata": {
+    "displayName": "Evotips adapter",
+    "displayCategory": "adapter",
+    "displayVolumeUnits": "\u00b5L",
+    "tags": []
+  },
+  "dimensions": {
+    "xDimension": 156.5,
+    "yDimension": 105,
+    "zDimension": 132
+  },
+  "wells": {},
+  "groups": [
+    {
+      "metadata": {},
+      "wells": []
+    }
+  ],
+  "parameters": {
+    "format": "96Standard",
+    "quirks": ["tiprackAdapterFor96Channel", "stackingMaxFive"],
+    "isTiprack": false,
+    "isMagneticModuleCompatible": false,
+    "loadName": "evotips_flex_96_tiprack_adapter"
+  },
+  "namespace": "opentrons",
+  "version": 1,
+  "schemaVersion": 2,
+  "allowedRoles": ["adapter"],
+  "cornerOffsetFromSlot": {
+    "x": -14.25,
+    "y": -3.5,
+    "z": 0
+  }
+}