Merge branch 'edge' into feat_liquid-class-schema

.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

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

abr-testing/Pipfile

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