Merge branch 'edge' into identify_labware_defs

Opentrons · Feb 12, 2025 · 868d2b4 · 868d2b4
2 parents a9ce38b + aeb64ff
commit 868d2b4
Show file tree

Hide file tree

Showing 183 changed files with 7,012 additions and 2,669 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,5 +1,3 @@
-version: 2.0
-
 coverage:
   status:
     project:
@@ -15,25 +13,25 @@ comment:
   layout: 'reach, diff, flags, files'
 
 ignore:
-  - 'webpack-config/**'
-  - 'hardware-testing/**'
-  - 'abr-testing/**'
-  - 'test-data-generation/**'
-  - 'performance-metrics/**'
-  - 'package-testing/**'
-  - 'opentrons-ai-server/**'
-  - 'opentrons-ai-client/**'
-  - 'g-code-testing/**'
-  - 'api-client/**'
-  - 'analyses-snapshot-testing/**'
-  - '.storybook/**'
-  - 'react-api-client/**'
-  - 'scripts/**'
-  - '.github/**'
-  - '**/build/**'
-  - '**/dist/**'
-  - '**/node_modules/**'
-  - '**/{test,tests,__tests__,__mocks__,mocks}/**'
+  - 'hardware-testing/**/*'
+  - 'abr-testing/**/*'
+  - 'test-data-generation/**/*'
+  - 'performance-metrics/**/*'
+  - 'package-testing/**/*'
+  - 'opentrons-ai-server/**/*'
+  - 'opentrons-ai-client/**/*'
+  - 'g-code-testing/**/*'
+  - 'api-client/**/*'
+  - 'analyses-snapshot-testing/**/*'
+  - '.storybook/**/*'
+  - 'react-api-client/**/*'
+  - 'scripts/**/*'
+  - '.github/**/*'
+  - '**/build/**/*'
+  - '**/dist/**/*'
+  - '**/node_modules/**/*'
+  - '**/cypress/**/*'
+  - '**/{test,tests,__tests__,__mocks__,mocks}/**/*'
   - '**/*.{md,yaml,yml,json,rst}'
   - '**/Makefile'
   - '**/*.{in,ini,lock,toml,cfg}'

diff --git a/.github/workflows/pd-test-build-deploy.yaml b/.github/workflows/pd-test-build-deploy.yaml
@@ -60,15 +60,15 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
 
   e2e-test:
-      name: 'protocol designer e2e tests'
-      runs-on: 'ubuntu-24.04'
-      timeout-minutes: 20
-      steps:
-        - name: 'Checkout Repository'
-          uses: actions/checkout@v4
-        - uses: ./.github/actions/js/setup
-        - name: 'run test-e2e'
-          run: make -C protocol-designer test-e2e
+    name: 'protocol designer e2e tests'
+    runs-on: 'ubuntu-24.04'
+    timeout-minutes: 20
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v4
+      - uses: ./.github/actions/js/setup
+      - name: 'run test-e2e'
+        run: make -C protocol-designer test-e2e
 
   build-pd:
     timeout-minutes: 20

diff --git a/Makefile b/Makefile
@@ -280,3 +280,7 @@ test-js-internal:
 .PHONY: test-js-%
 test-js-%: 
 	$(MAKE) test-js-internal tests="$(if $(tests),$(foreach test,$(tests),$*/$(test)),$*)" test_opts="$(test_opts)" cov_opts="$(cov_opts)"
+
+.PHONY: validate-codecov-yml
+validate-codecov-yml:
+	curl --data-binary @.codecov.yml https://codecov.io/validate
diff --git a/...est/test_analysis_snapshot[2b866b03f3][Flex_S_v2_21_P1000_96_GRIP_HS_MB_TC_TM_Smoke].json b/...est/test_analysis_snapshot[2b866b03f3][Flex_S_v2_21_P1000_96_GRIP_HS_MB_TC_TM_Smoke].json
@@ -1262,14 +1262,6 @@
             "brand": "Opentrons",
             "brandId": []
           },
-          "compatibleParentLabware": [
-            "armadillo_96_wellplate_200ul_pcr_full_skirt",
-            "biorad_96_wellplate_200ul_pcr",
-            "opentrons_96_wellplate_200ul_pcr_full_skirt",
-            "opentrons_flex_deck_riser",
-            "opentrons_tough_pcr_auto_sealing_lid",
-            "protocol_engine_lid_stack_object"
-          ],
           "cornerOffsetFromSlot": {
             "x": 0,
             "y": 0,
@@ -1341,7 +1333,7 @@
             "loadName": "opentrons_tough_pcr_auto_sealing_lid",
             "quirks": []
           },
-          "schemaVersion": 3,
+          "schemaVersion": 2,
           "stackLimit": 5,
           "stackingOffsetWithLabware": {
             "armadillo_96_wellplate_200ul_pcr_full_skirt": {
@@ -1373,11 +1365,6 @@
               "x": 0,
               "y": 0,
               "z": 6.492
-            },
-            "protocol_engine_lid_stack_object": {
-              "x": 0,
-              "y": 0,
-              "z": 0
             }
           },
           "stackingOffsetWithModule": {
@@ -1437,14 +1424,6 @@
             "brand": "Opentrons",
             "brandId": []
           },
-          "compatibleParentLabware": [
-            "armadillo_96_wellplate_200ul_pcr_full_skirt",
-            "biorad_96_wellplate_200ul_pcr",
-            "opentrons_96_wellplate_200ul_pcr_full_skirt",
-            "opentrons_flex_deck_riser",
-            "opentrons_tough_pcr_auto_sealing_lid",
-            "protocol_engine_lid_stack_object"
-          ],
           "cornerOffsetFromSlot": {
             "x": 0,
             "y": 0,
@@ -1516,7 +1495,7 @@
             "loadName": "opentrons_tough_pcr_auto_sealing_lid",
             "quirks": []
           },
-          "schemaVersion": 3,
+          "schemaVersion": 2,
           "stackLimit": 5,
           "stackingOffsetWithLabware": {
             "armadillo_96_wellplate_200ul_pcr_full_skirt": {
@@ -1548,11 +1527,6 @@
               "x": 0,
               "y": 0,
               "z": 6.492
-            },
-            "protocol_engine_lid_stack_object": {
-              "x": 0,
-              "y": 0,
-              "z": 0
             }
           },
           "stackingOffsetWithModule": {
@@ -1616,14 +1590,6 @@
             "brand": "Opentrons",
             "brandId": []
           },
-          "compatibleParentLabware": [
-            "armadillo_96_wellplate_200ul_pcr_full_skirt",
-            "biorad_96_wellplate_200ul_pcr",
-            "opentrons_96_wellplate_200ul_pcr_full_skirt",
-            "opentrons_flex_deck_riser",
-            "opentrons_tough_pcr_auto_sealing_lid",
-            "protocol_engine_lid_stack_object"
-          ],
           "cornerOffsetFromSlot": {
             "x": 0,
             "y": 0,
@@ -1695,7 +1661,7 @@
             "loadName": "opentrons_tough_pcr_auto_sealing_lid",
             "quirks": []
           },
-          "schemaVersion": 3,
+          "schemaVersion": 2,
           "stackLimit": 5,
           "stackingOffsetWithLabware": {
             "armadillo_96_wellplate_200ul_pcr_full_skirt": {
@@ -1727,11 +1693,6 @@
               "x": 0,
               "y": 0,
               "z": 6.492
-            },
-            "protocol_engine_lid_stack_object": {
-              "x": 0,
-              "y": 0,
-              "z": 0
             }
           },
           "stackingOffsetWithModule": {
@@ -1799,14 +1760,6 @@
             "brand": "Opentrons",
             "brandId": []
           },
-          "compatibleParentLabware": [
-            "armadillo_96_wellplate_200ul_pcr_full_skirt",
-            "biorad_96_wellplate_200ul_pcr",
-            "opentrons_96_wellplate_200ul_pcr_full_skirt",
-            "opentrons_flex_deck_riser",
-            "opentrons_tough_pcr_auto_sealing_lid",
-            "protocol_engine_lid_stack_object"
-          ],
           "cornerOffsetFromSlot": {
             "x": 0,
             "y": 0,
@@ -1878,7 +1831,7 @@
             "loadName": "opentrons_tough_pcr_auto_sealing_lid",
             "quirks": []
           },
-          "schemaVersion": 3,
+          "schemaVersion": 2,
           "stackLimit": 5,
           "stackingOffsetWithLabware": {
             "armadillo_96_wellplate_200ul_pcr_full_skirt": {
@@ -1910,11 +1863,6 @@
               "x": 0,
               "y": 0,
               "z": 6.492
-            },
-            "protocol_engine_lid_stack_object": {
-              "x": 0,
-              "y": 0,
-              "z": 0
             }
           },
           "stackingOffsetWithModule": {
@@ -1986,14 +1934,6 @@
             "brand": "Opentrons",
             "brandId": []
           },
-          "compatibleParentLabware": [
-            "armadillo_96_wellplate_200ul_pcr_full_skirt",
-            "biorad_96_wellplate_200ul_pcr",
-            "opentrons_96_wellplate_200ul_pcr_full_skirt",
-            "opentrons_flex_deck_riser",
-            "opentrons_tough_pcr_auto_sealing_lid",
-            "protocol_engine_lid_stack_object"
-          ],
           "cornerOffsetFromSlot": {
             "x": 0,
             "y": 0,
@@ -2065,7 +2005,7 @@
             "loadName": "opentrons_tough_pcr_auto_sealing_lid",
             "quirks": []
           },
-          "schemaVersion": 3,
+          "schemaVersion": 2,
           "stackLimit": 5,
           "stackingOffsetWithLabware": {
             "armadillo_96_wellplate_200ul_pcr_full_skirt": {
@@ -2097,11 +2037,6 @@
               "x": 0,
               "y": 0,
               "z": 6.492
-            },
-            "protocol_engine_lid_stack_object": {
-              "x": 0,
-              "y": 0,
-              "z": 0
             }
           },
           "stackingOffsetWithModule": {