Merge branch 'edge' into add_modules_to_deck_config

.eslintrc.js

@@ -15,7 +15,7 @@ module.exports = {
     'plugin:storybook/recommended',
   ],
 
-  plugins: ['react', 'react-hooks', 'json', 'jest', 'testing-library'],
+  plugins: ['react', 'react-hooks', 'json', 'testing-library'],
 
   rules: {
     camelcase: 'off',
@@ -107,31 +107,16 @@ module.exports = {
         '**/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', { fn: 'it' }],
         '@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',
-        'jest/no-alias-methods': 'warn',
-        'jest/valid-describe-callback': 'warn',
       },
     },
     {
       files: ['**/__tests__/**test.tsx'],
-      env: { jest: true },
       extends: ['plugin:testing-library/react'],
       rules: {
         'testing-library/no-manual-cleanup': 'off',

.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

@@ -65,7 +65,7 @@ jobs:
       uses: peter-evans/create-pull-request@v5
       with:
           commit-message: 'fix(app-testing): snapshot failure capture'
-          title: 'Evaluate Analyses Snapshot Update ${{ env.TARGET }}'
+          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}}

CONTRIBUTING.md

@@ -291,7 +291,7 @@ JavaScript dependencies are installed by [yarn][]. When calling yarn, you should
 A development dependency is any dependency that is used only to help manage the project. Examples of development dependencies would be:
 
 - Build tools (webpack, babel)
-- Testing/linting/checking tools (jest, typescript, eslint)
+- Testing/linting/checking tools (vitest, typescript, eslint)
 - Libraries used only in support scripts (aws, express)
 
 To add a development dependency:

DEV_SETUP.md

@@ -82,7 +82,7 @@ Close and re-open your terminal to confirm `nvs` is installed.
 nvs --version
 ```
 
-Now we can use nvs to install Node.js v18 and switch on `auto` mode, which will make sure Node.js v18 is used any time we're in the `opentrons` project directory.
+Now we can use `nvs` to install the currently required Node.js version set in `.nvmrc`. The `auto` command selects the correct version of Node.js any time we're in the `opentrons` project directory. Without `auto`, we would have to manually run `use` or `install` each time we work on the project.
 
 ```shell
 nvs add 18