Skip to content

Commit 7590453

Browse files
aaron-kulkarniaaron-kulkarni
authored
refactor(protocol-designer, shared-data) reverting labware schema changes (#15498)
<!-- Thanks for taking the time to open a pull request! Please make sure you've read the "Opening Pull Requests" section of our Contributing Guide: https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-pull-requests To ensure your code is reviewed quickly and thoroughly, please fill out the sections below to the best of your ability! --> # Overview <!-- Use this section to describe your pull-request at a high level. If the PR addresses any open issues, please tag the issues here. --> # Test Plan <!-- Use this section to describe the steps that you took to test your Pull Request. If you did not perform any testing provide justification why. OT-3 Developers: You should default to testing on actual physical hardware. Once again, if you did not perform testing against hardware, justify why. Note: It can be helpful to write a test plan before doing development Example Test Plan (HTTP API Change) - Verified that new optional argument `dance-party` causes the robot to flash its lights, move the pipettes, then home. - Verified that when you omit the `dance-party` option the robot homes normally - Added protocol that uses `dance-party` argument to G-Code Testing Suite - Ran protocol that did not use `dance-party` argument and everything was successful - Added unit tests to validate that changes to pydantic model are correct --> # Changelog <!-- List out the changes to the code in this PR. Please try your best to categorize your changes and describe what has changed and why. Example changelog: - Fixed app crash when trying to calibrate an illegal pipette - Added state to API to track pipette usage - Updated API docs to mention only two pipettes are supported IMPORTANT: MAKE SURE ANY BREAKING CHANGES ARE PROPERLY COMMUNICATED --> # Review requests <!-- Describe any requests for your reviewers here. --> # Risk assessment <!-- Carefully go over your pull request and look at the other parts of the codebase it may affect. Look for the possibility, even if you think it's small, that your change may affect some other part of the system - for instance, changing return tip behavior in protocol may also change the behavior of labware calibration. Identify the other parts of the system your codebase may affect, so that in addition to your own review and testing, other people who may not have the system internalized as much as you can focus their attention and testing there. -->
1 parent 2172685 commit 7590453

File tree

144 files changed

+1470
-7167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+1470
-7167
lines changed

‎app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[004ebb2b82][OT2_S_v2_11_P10S_P300M_MM_TC1_TM_Swift].json

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,6 @@
6262
]
6363
}
6464
],
65-
"liquidProbeParameters": {
66-
"minimumHeight": [
67-
{
68-
"applicableWells": [],
69-
"value": 0.5
70-
}
71-
],
72-
"minimumWellVolume": [
73-
{
74-
"applicableWells": [],
75-
"value": 0.0
76-
}
77-
]
78-
},
7965
"metadata": {
8066
"displayCategory": "reservoir",
8167
"displayName": "NEST 12 Well Reservoir 15 mL",
@@ -4074,20 +4060,6 @@
40744060
]
40754061
}
40764062
],
4077-
"liquidProbeParameters": {
4078-
"minimumHeight": [
4079-
{
4080-
"applicableWells": [],
4081-
"value": 0.5
4082-
}
4083-
],
4084-
"minimumWellVolume": [
4085-
{
4086-
"applicableWells": [],
4087-
"value": 0.0
4088-
}
4089-
]
4090-
},
40914063
"metadata": {
40924064
"displayCategory": "wellPlate",
40934065
"displayName": "NEST 96 Deep Well Plate 2mL",
@@ -5305,20 +5277,6 @@
53055277
]
53065278
}
53075279
],
5308-
"liquidProbeParameters": {
5309-
"minimumHeight": [
5310-
{
5311-
"applicableWells": [],
5312-
"value": 0.5
5313-
}
5314-
],
5315-
"minimumWellVolume": [
5316-
{
5317-
"applicableWells": [],
5318-
"value": 0.0
5319-
}
5320-
]
5321-
},
53225280
"metadata": {
53235281
"displayCategory": "aluminumBlock",
53245282
"displayName": "Opentrons 24 Well Aluminum Block with Generic 2 mL Screwcap",
@@ -5774,20 +5732,6 @@
57745732
]
57755733
}
57765734
],
5777-
"liquidProbeParameters": {
5778-
"minimumHeight": [
5779-
{
5780-
"applicableWells": [],
5781-
"value": 0.5
5782-
}
5783-
],
5784-
"minimumWellVolume": [
5785-
{
5786-
"applicableWells": [],
5787-
"value": 0.0
5788-
}
5789-
]
5790-
},
57915735
"metadata": {
57925736
"displayCategory": "wellPlate",
57935737
"displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt",

‎app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[011481812b][OT2_S_v2_7_P20S_None_Walkthrough].json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -146,20 +146,6 @@
146146
]
147147
}
148148
],
149-
"liquidProbeParameters": {
150-
"minimumHeight": [
151-
{
152-
"applicableWells": [],
153-
"value": 0.5
154-
}
155-
],
156-
"minimumWellVolume": [
157-
{
158-
"applicableWells": [],
159-
"value": 0.0
160-
}
161-
]
162-
},
163149
"metadata": {
164150
"displayCategory": "wellPlate",
165151
"displayName": "NEST 96 Well Plate 200 µL Flat",

‎app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[0190369ce5][Flex_S_v2_16_P1000_96_GRIP_HS_MB_TC_TM_DeckConfiguration1NoFixtures].json

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -770,20 +770,6 @@
770770
]
771771
}
772772
],
773-
"liquidProbeParameters": {
774-
"minimumHeight": [
775-
{
776-
"applicableWells": [],
777-
"value": 0.5
778-
}
779-
],
780-
"minimumWellVolume": [
781-
{
782-
"applicableWells": [],
783-
"value": 0.0
784-
}
785-
]
786-
},
787773
"metadata": {
788774
"displayCategory": "aluminumBlock",
789775
"displayName": "Opentrons 96 Well Aluminum Block",
@@ -1935,20 +1921,6 @@
19351921
]
19361922
}
19371923
],
1938-
"liquidProbeParameters": {
1939-
"minimumHeight": [
1940-
{
1941-
"applicableWells": [],
1942-
"value": 0.5
1943-
}
1944-
],
1945-
"minimumWellVolume": [
1946-
{
1947-
"applicableWells": [],
1948-
"value": 0.0
1949-
}
1950-
]
1951-
},
19521924
"metadata": {
19531925
"displayCategory": "wellPlate",
19541926
"displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt",
@@ -3117,20 +3089,6 @@
31173089
]
31183090
}
31193091
],
3120-
"liquidProbeParameters": {
3121-
"minimumHeight": [
3122-
{
3123-
"applicableWells": [],
3124-
"value": 0.5
3125-
}
3126-
],
3127-
"minimumWellVolume": [
3128-
{
3129-
"applicableWells": [],
3130-
"value": 0.0
3131-
}
3132-
]
3133-
},
31343092
"metadata": {
31353093
"displayCategory": "wellPlate",
31363094
"displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt",
@@ -4195,20 +4153,6 @@
41954153
"wells": []
41964154
}
41974155
],
4198-
"liquidProbeParameters": {
4199-
"minimumHeight": [
4200-
{
4201-
"applicableWells": [],
4202-
"value": 0.5
4203-
}
4204-
],
4205-
"minimumWellVolume": [
4206-
{
4207-
"applicableWells": [],
4208-
"value": 0.0
4209-
}
4210-
]
4211-
},
42124156
"metadata": {
42134157
"displayCategory": "adapter",
42144158
"displayName": "Opentrons Flex 96 Tip Rack Adapter",
@@ -5422,20 +5366,6 @@
54225366
"wells": []
54235367
}
54245368
],
5425-
"liquidProbeParameters": {
5426-
"minimumHeight": [
5427-
{
5428-
"applicableWells": [],
5429-
"value": 0.5
5430-
}
5431-
],
5432-
"minimumWellVolume": [
5433-
{
5434-
"applicableWells": [],
5435-
"value": 0.0
5436-
}
5437-
]
5438-
},
54395369
"metadata": {
54405370
"displayCategory": "adapter",
54415371
"displayName": "Opentrons Flex 96 Tip Rack Adapter",

‎app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[0256665840][OT2_S_v2_16_P300M_P20S_aspirateDispenseMix0Volume].json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,20 +2386,6 @@
23862386
]
23872387
}
23882388
],
2389-
"liquidProbeParameters": {
2390-
"minimumHeight": [
2391-
{
2392-
"applicableWells": [],
2393-
"value": 0.5
2394-
}
2395-
],
2396-
"minimumWellVolume": [
2397-
{
2398-
"applicableWells": [],
2399-
"value": 0.0
2400-
}
2401-
]
2402-
},
24032389
"metadata": {
24042390
"displayCategory": "reservoir",
24052391
"displayName": "NEST 12 Well Reservoir 15 mL",

‎app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[041ad55e7b][OT2_S_v2_15_P300M_P20S_HS_TC_TM_dispense_changes].json

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,20 +2421,6 @@
24212421
]
24222422
}
24232423
],
2424-
"liquidProbeParameters": {
2425-
"minimumHeight": [
2426-
{
2427-
"applicableWells": [],
2428-
"value": 0.5
2429-
}
2430-
],
2431-
"minimumWellVolume": [
2432-
{
2433-
"applicableWells": [],
2434-
"value": 0.0
2435-
}
2436-
]
2437-
},
24382424
"metadata": {
24392425
"displayCategory": "reservoir",
24402426
"displayName": "NEST 12 Well Reservoir 15 mL",
@@ -2675,20 +2661,6 @@
26752661
]
26762662
}
26772663
],
2678-
"liquidProbeParameters": {
2679-
"minimumHeight": [
2680-
{
2681-
"applicableWells": [],
2682-
"value": 0.5
2683-
}
2684-
],
2685-
"minimumWellVolume": [
2686-
{
2687-
"applicableWells": [],
2688-
"value": 0.0
2689-
}
2690-
]
2691-
},
26922664
"metadata": {
26932665
"displayCategory": "reservoir",
26942666
"displayName": "NEST 12 Well Reservoir 15 mL",

0 commit comments

Comments
 (0)