Merge branch 'edge' into test-pressure-glycerol

.codecov.yml

@@ -1,6 +1,5 @@
 ignore:
   - '**/node_modules'
-  - 'protocol-library-kludge'
   - 'webpack-config'
   - 'hardware-testing'
   - '**/*.md'

.eslintignore

@@ -5,11 +5,11 @@
 **/build/**
 **/venv/**
 .opentrons_config
-
+**/tsconfig*.json
+**/vite.config.ts
 # prettier
 **/package.json
 **/CHANGELOG.md
-lerna.json
 !api/release-notes.md
 !app-shell/build/release-notes.md
 
@@ -25,9 +25,10 @@ storybook-static
 api/**
 update-server/**
 robot-server/**
-notify-server/**
 shared-data/python/**
 hardware-testing/**
 
 # app-testing don't format the json protocols
 app-testing/files
+# app testing don't format the snapshots
+app-testing/tests/__snapshots__

.eslintrc.js

@@ -7,9 +7,15 @@ module.exports = {
     project: require('path').join(__dirname, 'tsconfig-eslint.json'),
   },
 
-  extends: ['standard-with-typescript', 'plugin:react/recommended', 'prettier'],
+  extends: [
+    'standard-with-typescript',
+    'plugin:react/recommended',
+    'prettier',
+    'plugin:json/recommended',
+    'plugin:storybook/recommended',
+  ],
 
-  plugins: ['react', 'react-hooks', 'json', 'jest'],
+  plugins: ['react', 'react-hooks', 'json', 'testing-library'],
 
   rules: {
     camelcase: 'off',
@@ -50,7 +56,15 @@ module.exports = {
   overrides: [
     {
       files: ['**/*.js'],
-      parser: '@babel/eslint-parser',
+      extends: ['plugin:@typescript-eslint/disable-type-checked'],
+      parserOptions: {
+        project: require('path').join(__dirname, 'tsconfig-eslint.json'),
+      },
+      rules: {
+        '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/explicit-function-return-type': 'warn',
+        '@typescript-eslint/no-unused-vars': 'warn',
+      },
     },
     {
       // TODO(mc, 2021-03-18): remove to default these rules back to errors
@@ -65,6 +79,22 @@ module.exports = {
         '@typescript-eslint/no-floating-promises': 'warn',
         '@typescript-eslint/no-unnecessary-type-assertion': 'warn',
         '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'warn',
+        '@typescript-eslint/no-unsafe-argument': 'warn',
+        '@typescript-eslint/consistent-type-imports': 'warn',
+        '@typescript-eslint/consistent-indexed-object-style': 'warn',
+        '@typescript-eslint/no-confusing-void-expression': 'warn',
+        '@typescript-eslint/ban-types': 'warn',
+        '@typescript-eslint/non-nullable-type-assertion-style': 'warn',
+        '@typescript-eslint/await-thenable': 'warn',
+        '@typescript-eslint/ban-ts-comment': 'warn',
+        '@typescript-eslint/unbound-method': 'warn',
+        '@typescript-eslint/consistent-generic-constructors': 'warn',
+        '@typescript-eslint/no-misused-promises': 'warn',
+        // need this to be able to pass in css prop into raw elements (babel adds this at build time for styled-components)
+        'react/no-unknown-property': [
+          'error',
+          { ignore: ['css', 'indeterminate'] },
+        ],
       },
     },
     {
@@ -74,25 +104,23 @@ module.exports = {
         '**/__mocks__/**.@(js|ts|tsx)',
         '**/__utils__/**.@(js|ts|tsx)',
         '**/__fixtures__/**.@(js|ts|tsx)',
+        '**/fixtures/**.@(js|ts|tsx)',
         'scripts/*.@(js|ts|tsx)',
       ],
-      env: {
-        jest: true,
-      },
-      extends: ['plugin:jest/recommended'],
       rules: {
-        'jest/expect-expect': 'off',
-        'jest/no-standalone-expect': 'off',
-        'jest/no-disabled-tests': 'error',
-        'jest/consistent-test-it': 'error',
         '@typescript-eslint/consistent-type-assertions': 'off',
         '@typescript-eslint/no-var-requires': 'off',
         '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/no-confusing-void-expression': 'warn',
         'node/handle-callback-err': 'off',
-        // TODO(mc, 2021-01-29): fix these and remove warning overrides
-        'jest/no-deprecated-functions': 'warn',
-        'jest/valid-title': 'warn',
-        'jest/no-conditional-expect': 'warn',
+      },
+    },
+    {
+      files: ['**/__tests__/**test.tsx'],
+      extends: ['plugin:testing-library/react'],
+      rules: {
+        'testing-library/no-manual-cleanup': 'off',
+        'testing-library/prefer-screen-queries': 'warn',
       },
     },
     {
@@ -105,6 +133,9 @@ module.exports = {
     {
       files: ['**/cypress/**'],
       extends: ['plugin:cypress/recommended'],
+      rules: {
+        'cypress/unsafe-to-chain-command': 'warn',
+      },
     },
   ],
 }

.github/CODEOWNERS

@@ -12,7 +12,6 @@
 /protocol-designer @Opentrons/app-and-uis
 /labware-designer @Opentrons/app-and-uis
 /labware-library @Opentrons/app-and-uis
-/protocol-library-kludge @Opentrons/app-and-uis
 /update-server @Opentrons/robot-svcs
 /discovery-client @Opentrons/robot-svcs @Opentrons/app-and-uis
 /shared-data/pipette @Opentrons/embedded-sw
@@ -24,6 +23,8 @@
 # subprojects by language - some subprojects are shared by teams but united by a
 # language community (including makefiles and config) so mark them appropriately
 /app @Opentrons/js
+/api-client @Opentrons/js
+/react-api-client @Opentrons/js
 /app-shell @Opentrons/js
 /components @Opentrons/js
 /api @Opentrons/py

.github/actions/python/pypi-deploy/action.yaml

@@ -28,7 +28,7 @@ runs:
           fi
         fi
         status=0
-        QUIET=1 BUILD_NUMBER=${OT_BUILD} make -C ${{ inputs.project }} clean deploy twine_repository_url=${{ inputs.repository_url }} pypi_username=opentrons pypi_password=${{ inputs.password }} || status=$?
+        CI=1 QUIET=1 BUILD_NUMBER=${OT_BUILD} make -C ${{ inputs.project }} clean deploy twine_repository_url=${{ inputs.repository_url }} pypi_username=__token__ pypi_password=${{ inputs.password }} || status=$?
         if [[ ${status} != 0 ]] && [[ ${{ inputs.repository_url }} =~ "test.pypi.org" ]]; then
           echo "upload failures allowed to test pypi"
           exit 0

.github/actions/python/setup/action.yaml

@@ -25,8 +25,10 @@ runs:
       if: ${{ inputs.python-version != 'false' }}
       run: echo "OT_VIRTUALENV_VERSION=${{ inputs.python-version }}" >> $GITHUB_ENV
     - shell: bash
-      run: |
-        npm install --global [email protected]
-        $OT_PYTHON -m pip install pipenv==2021.5.29
+      run: npm install --global [email protected]
+    - shell: bash
+      run: $OT_PYTHON -m pip install --upgrade pip
+    - shell: bash
+      run: $OT_PYTHON -m pip install --user pipenv==2023.12.1
     - shell: bash
-      run: 'make -C ${{ inputs.project }} setup'
+      run: 'make -C ${{ inputs.project }} setup || make -C ${{ inputs.project }} setup'

.github/actions/webstack/deploy-to-sandbox/action.yaml

@@ -15,4 +15,4 @@ runs:
   steps:
     - shell: bash
       run: |
-        aws s3 sync ${{ inputs.distPath }} s3://sandbox.${{ inputs.domain }}/${{ inputs.destPrefix }} --acl=public-read
+        aws s3 sync ${{ inputs.distPath }} s3://sandbox.${{ inputs.domain }}/${{ inputs.destPrefix }}

.github/workflows/abr-testing-lint-test.yaml

@@ -0,0 +1,59 @@
+# This workflow runs test and lint on branch pushes that touch the abr-testing
+# project or its dependencies.
+
+name: 'abr-testing lint/test'
+on:
+  push:
+    paths:
+      - 'Makefile'
+      - 'abr-testing/**'
+      - 'scripts/**/*.mk'
+      - 'scripts/**/*.py'
+      - '.github/workflows/abr-testing-lint-test.yaml'
+      - '.github/actions/python/**'
+    branches:
+      - 'edge'
+    tags-ignore:
+      - '*'
+  pull_request:
+    paths:
+      - 'abr-testing/**'
+      - 'scripts/**/*.mk'
+      - 'scripts/**/*.py'
+      - '.github/workflows/abr-testing-lint-test.yaml'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.ref_name != 'edge' || github.run_id}}-${{ github.ref_type != 'tag' || github.run_id }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  lint-test:
+    runs-on: 'windows-latest'
+    steps:
+      - name: Checkout opentrons repo
+        uses: 'actions/checkout@v3'
+        with:
+          fetch-depth: 0
+      - name: Setup Node
+        uses: 'actions/setup-node@v3'
+        with:
+          node-version: '12'
+      - name: Setup Python
+        uses: 'actions/setup-python@v4'
+        with:
+          python-version: '3.10'
+      - name: Set up abr-testing project
+        uses: './.github/actions/python/setup'
+        with:
+          project: 'abr-testing'
+      - name: lint
+        run:
+          make -C abr-testing lint
+      - name: test
+        run:
+          make -C abr-testing test

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

@@ -0,0 +1,72 @@
+name: Analyses Snapshot Test
+
+on:
+  workflow_dispatch:
+    inputs:
+      TARGET:
+        description: 'Target branch or tag'
+        required: true
+        default: 'edge'
+      TEST_SOURCE:
+        description: 'Target for the test code'
+        required: true
+        default: 'edge'
+  schedule:
+    - cron:  '26 7 * * *' # 7:26 AM UTC
+
+jobs:
+  build-and-test:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    env:
+      TARGET: ${{ github.event.inputs.TARGET || 'edge' }}
+      TEST_SOURCE: ${{ github.event.inputs.TEST_SOURCE || 'edge' }}
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ env.TEST_SOURCE }}
+
+    - name: Docker Build
+      working-directory: app-testing
+      run: make build-opentrons-analysis
+
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+        cache: 'pipenv'
+        cache-dependency-path: app-testing/Pipfile.lock
+
+    - name: Setup Python Dependencies
+      working-directory: app-testing
+      run: make setup
+
+    - name: Run Test
+      id: run_test
+      working-directory: app-testing
+      run: make snapshot-test
+
+    - name: Upload Report
+      if: '!cancelled()'
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-report
+        path: app-testing/results/
+
+    - name: Handle Test Failure
+      if: failure()
+      working-directory: app-testing
+      run: make snapshot-test-update
+
+    - name: Create Snapshot update Request
+      if: failure()
+      uses: peter-evans/create-pull-request@v5
+      with:
+          commit-message: 'fix(app-testing): snapshot failure capture'
+          title: 'fix(app-testing): snapshot failure capture'
+          body: 'This PR is an automated snapshot update request. Please review the changes and merge if they are acceptable or find you bug and fix it.'
+          branch: 'app-testing/${{ env.TARGET }}-from-${{ env.TEST_SOURCE}}'
+          base: ${{ env.TEST_SOURCE}}
+

.github/workflows/api-test-lint-deploy.yaml

@@ -56,10 +56,10 @@ jobs:
           fetch-depth: 0
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - uses: 'actions/setup-python@v4'
         with:
-          python-version: '3.7'
+          python-version: '3.10'
 
       - uses: './.github/actions/python/setup'
         with:
@@ -75,17 +75,13 @@ jobs:
         os: ['windows-2022', 'ubuntu-22.04', 'macos-latest']
         # TODO(mc, 2022-02-24): expand this matrix to 3.8 and 3.9,
         # preferably in a nightly cronjob on edge or something
-        python: ['3.7', '3.10']
+        python: ['3.10']
         with-ot-hardware: ['true', 'false']
         exclude:
           - os: 'windows-2022'
             with-ot-hardware: 'true'
           - os: 'macos-latest'
             with-ot-hardware: 'true'
-          - os: 'macos-latest'
-            python: '3.10'
-          - python: '3.10'
-            with-ot-hardware: 'true'
     runs-on: '${{ matrix.os }}'
     steps:
       - uses: 'actions/checkout@v3'
@@ -99,7 +95,7 @@ jobs:
           git checkout ${{ github.ref }}
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - uses: 'actions/setup-python@v4'
         with:
           python-version: ${{ matrix.python }}
@@ -149,10 +145,10 @@ jobs:
           git checkout ${{ github.ref }}
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - uses: 'actions/setup-python@v4'
         with:
-          python-version: '3.7'
+          python-version: '3.10'
       - name: 'set complex environment variables'
         uses: actions/github-script@v6
         with:
@@ -169,11 +165,11 @@ jobs:
         with:
           project: 'api'
           repository_url: 'https://test.pypi.org/legacy/'
-          password: '${{ secrets.OT_TEST_PYPI_PASSWORD }}'
+          password: '${{ secrets.TEST_PYPI_DEPLOY_TOKEN_OPENTRONS }}'
       - if: startsWith(env.OT_TAG, 'v')
         name: 'upload to real pypi'
         uses: './.github/actions/python/pypi-deploy'
         with:
           project: 'api'
           repository_url: 'https://upload.pypi.org/legacy/'
-          password: '${{ secrets.OT_PYPI_PASSWORD }}'
+          password: '${{ secrets.PYPI_DEPLOY_TOKEN_OPENTRONS }}'