Merge branch 'edge' into PLAT-451-handle-estop-with-plate-reader

Opentrons · Oct 23, 2024 · 74b02cc · 74b02cc
2 parents 837fe9a + 7bc2504
commit 74b02cc
Show file tree

Hide file tree

Showing 453 changed files with 14,972 additions and 5,014 deletions.
diff --git a/.github/workflows/app-test-build-deploy.yaml b/.github/workflows/app-test-build-deploy.yaml
@@ -97,7 +97,11 @@ jobs:
     strategy:
       matrix:
         os: ['windows-2022', 'ubuntu-22.04', 'macos-latest']
-    name: 'opentrons app backend unit tests on ${{matrix.os}}'
+        shell: ['app-shell', 'app-shell-odd', 'discovery-client']
+        exclude:
+          - os: 'windows-2022'
+            shell: 'app-shell-odd'
+    name: 'opentrons ${{matrix.shell}} unit tests on ${{matrix.os}}'
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}
     steps:
@@ -144,7 +148,7 @@ jobs:
           yarn config set cache-folder ${{ github.workspace }}/.yarn-cache
           make setup-js
       - name: 'test native(er) packages'
-        run: make test-js-internal tests="app-shell/src app-shell-odd/src discovery-client/src" cov_opts="--coverage=true"
+        run: make test-js-internal tests="${{}matrix.shell}/src" cov_opts="--coverage=true"
       - name: 'Upload coverage report'
         uses: 'codecov/codecov-action@v3'
         with:

diff --git a/.github/workflows/opentrons-ai-client-staging-continuous-deploy.yaml b/.github/workflows/opentrons-ai-client-staging-continuous-deploy.yaml
@@ -52,6 +52,9 @@ jobs:
           yarn config set cache-folder ${{ github.workspace }}/.yarn-cache
           make setup-js
       - name: 'build'
+        env:
+            # inject dev id since this is for staging
+            OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_DEV_ID }}
         run: |
           make -C opentrons-ai-client build-staging
       - name: Configure AWS Credentials

diff --git a/...pentrons-ai-client-test-build-deploy.yaml → ...b/workflows/opentrons-ai-client-test.yaml b/...pentrons-ai-client-test-build-deploy.yaml → ...b/workflows/opentrons-ai-client-test.yaml
@@ -9,12 +9,9 @@ on:
     paths:
       - 'Makefile'
       - 'opentrons-ai-client/**/*'
-      - 'components/**/*'
-      - '*.js'
-      - '*.json'
-      - 'yarn.lock'
-      - '.github/workflows/app-test-build-deploy.yaml'
-      - '.github/workflows/utils.js'
+      - 'components/**'
+      - 'shared-data/**'
+      - '.github/workflows/opentrons-ai-client-test.yml'
     branches:
       - '**'
     tags:
@@ -24,10 +21,9 @@ on:
     paths:
       - 'Makefile'
       - 'opentrons-ai-client/**/*'
-      - 'components/**/*'
-      - '*.js'
-      - '*.json'
-      - 'yarn.lock'
+      - 'components/**'
+      - 'shared-data/**'
+      - '.github/workflows/opentrons-ai-client-test.yml'
   workflow_dispatch:
 
 concurrency:

diff --git a/.github/workflows/opentrons-ai-production-deploy.yaml b/.github/workflows/opentrons-ai-production-deploy.yaml
@@ -52,6 +52,8 @@ jobs:
           yarn config set cache-folder ${{ github.workspace }}/.yarn-cache
           make setup-js
       - name: 'build'
+        env:
+              OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_ID }}
         run: |
           make -C opentrons-ai-client build-production
       - name: Configure AWS Credentials

diff --git a/abr-testing/Makefile b/abr-testing/Makefile
@@ -88,3 +88,14 @@ push-no-restart-ot3: sdist Pipfile.lock
 
 .PHONY: push-ot3
 push-ot3: push-no-restart-ot3
+
+.PHONY: abr-setup
+abr-setup:
+	$(python) abr_testing/tools/abr_setup.py
+
+.PHONY: simulate
+PROTOCOL_DIR := abr_testing/protocols
+SIMULATION_TOOL := protocol_simulation/abr_sim_check.py
+EXTENSION := .py
+simulate:
+	$(python) $(SIMULATION_TOOL)
diff --git a/abr-testing/abr_testing/automation/google_sheets_tool.py b/abr-testing/abr_testing/automation/google_sheets_tool.py
@@ -167,6 +167,7 @@ def column_letter_to_index(column_letter: str) -> int:
             self.spread_sheet.batch_update(body=body)
         except gspread.exceptions.APIError as e:
             print(f"ERROR MESSAGE: {e}")
+            raise
 
     def update_cell(
         self, sheet_title: str, row: int, column: int, single_data: Any