Merge branch 'edge' into pd-e2e-convo-starter

.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:

.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

.github/workflows/opentrons-ai-client-test-build-deploy.yaml → .github/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:

.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

.github/workflows/pd-test-build-deploy.yaml

@@ -79,49 +79,49 @@ jobs:
           files: ./coverage/lcov.info
           flags: protocol-designer
 
-  e2e-test:
-    name: 'pd e2e tests'
-    needs: ['js-unit-test']
-    timeout-minutes: 30
-    strategy:
-      matrix:
-        os: ['ubuntu-22.04']
-    runs-on: '${{ matrix.os }}'
-    steps:
-      - uses: 'actions/checkout@v3'
-        with:
-          fetch-depth: 0
-      # https://github.com/actions/checkout/issues/290
-      - name: 'Fix actions/checkout odd handling of tags'
-        if: startsWith(github.ref, 'refs/tags')
-        run: |
-          git fetch -f origin ${{ github.ref }}:${{ github.ref }}
-          git checkout ${{ github.ref }}
-      - uses: 'actions/setup-node@v3'
-        with:
-          node-version: '18.19.0'
-      - name: 'install udev for usb-detection'
-        if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          # WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
-          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update && sudo apt-get install libudev-dev
-      - name: 'cache yarn cache'
-        uses: actions/cache@v3
-        with:
-          path: |
-            ${{ github.workspace }}/.yarn-cache
-            ${{ github.workspace }}/.npm-cache
-          key: js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-
-      - name: 'setup-js'
-        run: |
-          npm config set cache ./.npm-cache
-          yarn config set cache-folder ./.yarn-cache
-          make setup-js
-      - name: 'test-e2e'
-        run: make -C protocol-designer test-e2e
+  # e2e-test:
+  #   name: 'pd e2e tests'
+  #   needs: ['js-unit-test']
+  #   timeout-minutes: 30
+  #   strategy:
+  #     matrix:
+  #       os: ['ubuntu-22.04']
+  #   runs-on: '${{ matrix.os }}'
+  #   steps:
+  #     - uses: 'actions/checkout@v3'
+  #       with:
+  #         fetch-depth: 0
+  #     # https://github.com/actions/checkout/issues/290
+  #     - name: 'Fix actions/checkout odd handling of tags'
+  #       if: startsWith(github.ref, 'refs/tags')
+  #       run: |
+  #         git fetch -f origin ${{ github.ref }}:${{ github.ref }}
+  #         git checkout ${{ github.ref }}
+  #     - uses: 'actions/setup-node@v3'
+  #       with:
+  #         node-version: '18.19.0'
+  #     - name: 'install udev for usb-detection'
+  #       if: startsWith(matrix.os, 'ubuntu')
+  #       run: |
+  #         # WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
+  #         sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+  #         sudo apt-get update && sudo apt-get install libudev-dev
+  #     - name: 'cache yarn cache'
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: |
+  #           ${{ github.workspace }}/.yarn-cache
+  #           ${{ github.workspace }}/.npm-cache
+  #         key: js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+  #         restore-keys: |
+  #           js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-
+  #     - name: 'setup-js'
+  #       run: |
+  #         npm config set cache ./.npm-cache
+  #         yarn config set cache-folder ./.yarn-cache
+  #         make setup-js
+  #     - name: 'test-e2e'
+  #       run: make -C protocol-designer test-e2e
   build-pd:
     name: 'build protocol designer artifact'
     needs: ['js-unit-test']

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 := abr_testing/protocol_simulation/abr_sim_check.py
+EXTENSION := .py
+simulate:
+	$(python) $(SIMULATION_TOOL)

abr-testing/Pipfile

@@ -18,7 +18,7 @@ slackclient = "*"
 slack-sdk = "*"
 pandas = "*"
 pandas-stubs = "*"
-numpy = "==1.8.3"
+paramiko = "*"
 
 [dev-packages]
 atomicwrites = "==1.4.1"