merge branch 'edge' into v8.1.0-release-to-edge

.eslintignore

@@ -6,7 +6,7 @@
 **/venv/**
 .opentrons_config
 **/tsconfig*.json
-**/vite.config.ts
+**/vite.config.mts
 # prettier
 **/package.json
 **/CHANGELOG.md

.eslintrc.js

@@ -13,9 +13,10 @@ module.exports = {
     'prettier',
     'plugin:json/recommended',
     'plugin:storybook/recommended',
+    'plugin:react/jsx-runtime',
   ],
 
-  plugins: ['react', 'react-hooks', 'json', 'testing-library'],
+  plugins: ['react', 'react-hooks', 'json', 'testing-library', 'opentrons'],
 
   rules: {
     camelcase: 'off',
@@ -116,6 +117,12 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ['./app/src/**/*.@(ts|tsx)'],
+      rules: {
+        'import/no-absolute-path': 'off',
+      },
+    },
     {
       files: [
         '**/test/**.js',
@@ -161,5 +168,25 @@ module.exports = {
         'no-restricted-imports': 'off',
       },
     },
+    // Apply tree-of-life import requirements to app as errors
+    {
+      files: ['./app/src/**/*.@(ts|tsx)'],
+      rules: {
+        'opentrons/no-imports-up-the-tree-of-life': 'error',
+      },
+    },
+    {
+      files: ['./protocol-designer/src/**/*.@(ts|tsx)'],
+      rules: {
+        'opentrons/no-imports-up-the-tree-of-life': 'warn',
+      },
+    },
+    // apply application structure import requirements to app
+    {
+      files: ['./app/src/**/*.@(ts|tsx)'],
+      rules: {
+        'opentrons/no-imports-across-applications': 'error',
+      },
+    },
   ],
 }

.github/workflows/analyses-snapshot-lint.yaml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup Python
         uses: 'actions/setup-python@v5'
         with:
-          python-version: '3.12'
+          python-version: '3.13.0'
           cache: 'pipenv'
           cache-dependency-path: analyses-snapshot-testing/Pipfile.lock
       - name: Setup

.github/workflows/analyses-snapshot-test.yaml

@@ -48,8 +48,8 @@ jobs:
       ANALYSIS_REF: ${{ github.event.inputs.ANALYSIS_REF || github.head_ref || 'edge' }}
       SNAPSHOT_REF: ${{ github.event.inputs.SNAPSHOT_REF || github.head_ref || 'edge' }}
       # If we're running because of workflow_dispatch, use the user input to decide
-      # whether to open a PR on failure. Otherwise, there is no user input, so always
-      # open a PR on failure.
+      # whether to open a PR on failure. Otherwise, there is no user input,
+      # so we only open a PR if the PR has the label 'gen-analyses-snapshot-pr'
       OPEN_PR_ON_FAILURE: ${{ (github.event_name == 'workflow_dispatch' && github.events.inputs.OPEN_PR_ON_FAILURE) || ((github.event_name != 'workflow_dispatch') && (contains(github.event.pull_request.labels.*.name, 'gen-analyses-snapshot-pr'))) }}
       PR_TARGET_BRANCH: ${{ github.event.pull_request.base.ref || 'not a pr'}}
     steps:
@@ -75,10 +75,10 @@ jobs:
         working-directory: analyses-snapshot-testing
         run: make build-opentrons-analysis
 
-      - name: Set up Python 3.12
+      - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13.0'
           cache: 'pipenv'
           cache-dependency-path: analyses-snapshot-testing/Pipfile.lock
 
@@ -107,7 +107,7 @@ jobs:
       - name: Create Snapshot update Request
         id: create_pull_request
         if: always() && steps.handle_failure.outcome == 'success' && env.OPEN_PR_ON_FAILURE == 'true' && github.event_name == 'pull_request'
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: 'fix(analyses-snapshot-testing): heal analyses snapshots'
           title: 'fix(analyses-snapshot-testing): heal ${{ env.ANALYSIS_REF }} snapshots'
@@ -130,7 +130,7 @@ jobs:
 
       - name: Create Snapshot update Request on edge overnight failure
         if: always() && steps.handle_failure.outcome == 'success' && github.event_name == 'schedule'
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with: # scheduled run uses the default values for ANALYSIS_REF and SNAPSHOT_REF which are edge
           commit-message: 'fix(analyses-snapshot-testing): heal ${{ env.ANALYSIS_REF }} snapshots'
           title: 'fix(analyses-snapshot-testing): heal ${{ env.ANALYSIS_REF }} snapshots'

.github/workflows/opentrons-ai-server-lint-test.yaml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup Python
         uses: 'actions/setup-python@v5'
         with:
-          python-version: '3.12.4'
+          python-version: '3.12'
           cache: 'pipenv'
           cache-dependency-path: opentrons-ai-server/Pipfile.lock
       - name: Setup

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

@@ -162,7 +162,7 @@ jobs:
           OT_PD_MIXPANEL_ID: ${{ secrets.OT_PD_MIXPANEL_ID }}
           OT_PD_MIXPANEL_DEV_ID: ${{ secrets.OT_PD_MIXPANEL_DEV_ID }}
         run: |
-          make -C protocol-designer
+          make -C protocol-designer NODE_ENV=development
       - name: 'upload github artifact'
         uses: actions/upload-artifact@v3
         with:
@@ -215,4 +215,7 @@ jobs:
           aws configure set role_arn ${{ secrets.OT_PD_DEPLOY_ROLE }} --profile deploy
           aws configure set source_profile identity --profile deploy
           aws s3 sync ./dist s3://sandbox.designer.opentrons.com/${{ env.OT_BRANCH }} --acl=public-read --profile=deploy
+          # invalidate both sandbox.opentrons.com and www.sandbox.opentrons.com cloudfront caches
+          aws cloudfront create-invalidation --distribution-id ${{ secrets.PD_CLOUDFRONT_SANDBOX_DISTRIBUTION_ID }} --paths "/*" --profile deploy
+          aws cloudfront create-invalidation --distribution-id ${{ secrets.PD_CLOUDFRONT_SANDBOX_WWW_DISTRIBUTION_ID }} --paths "/*" --profile deploy
         shell: bash

.github/workflows/react-api-client-test.yaml

@@ -32,7 +32,7 @@ env:
 
 jobs:
   js-unit-test:
-    name: 'react-api-client unit tests'
+    name: 'api-client and react-api-client unit tests'
     timeout-minutes: 30
     runs-on: 'ubuntu-22.04'
     steps:
@@ -59,8 +59,8 @@ jobs:
           npm config set cache ./.npm-cache
           yarn config set cache-folder ./.yarn-cache
           make setup-js
-      - name: 'run react-api-client unit tests'
-        run: make -C react-api-client test-cov
+      - name: 'run api-client and react-api-client unit tests'
+        run: make -C api-client test-cov
       - name: 'Upload coverage report'
         uses: codecov/codecov-action@v3
         with:

.storybook/main.js

@@ -2,6 +2,7 @@ module.exports = {
   stories: [
     '../components/**/*.stories.@(js|jsx|ts|tsx)',
     '../app/**/*.stories.@(js|jsx|ts|tsx)',
+    '../protocol-designer/**/*.stories.@(js|jsx|ts|tsx)',
     '../opentrons-ai-client/**/*.stories.@(js|jsx|ts|tsx)',
   ],
 

.storybook/preview.jsx

@@ -1,4 +1,3 @@
-import React from 'react'
 import { I18nextProvider } from 'react-i18next'
 import { GlobalStyle } from '../app/src/atoms/GlobalStyle'
 import { i18n } from '../app/src/i18n'
@@ -7,7 +6,7 @@ global.APP_SHELL_REMOTE = {
   ipcRenderer: {
     on: (topic, cb) => {},
     invoke: (callname, args) => {},
-    send:  (message, payload) => {}
+    send: (message, payload) => {},
   },
 }
 global._PKG_VERSION_ = '0.0.0-storybook'
@@ -29,8 +28,8 @@ export const customViewports = {
     type: 'desktop',
     styles: {
       width: '600px',
-      height: '450px'
-    }
+      height: '450px',
+    },
   },
   desktopSmall: {
     // A size typically used in figma app backgrounds, useful for viewing
@@ -39,9 +38,9 @@ export const customViewports = {
     type: 'desktop',
     styles: {
       width: '1024px',
-      height: '700px'
-    }
-  }
+      height: '700px',
+    },
+  },
 }
 
 export const parameters = {
@@ -50,7 +49,14 @@ export const parameters = {
   options: {
     storySort: {
       method: 'alphabetical',
-      order: ['Design Tokens', 'Library', 'App', 'ODD', 'AI'],
+      order: [
+        'Design Tokens',
+        'Library',
+        'App',
+        'ODD',
+        'Protocol-Designer',
+        'AI',
+      ],
     },
   },
 }

abr-testing/Pipfile

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