Merge branch 'edge' into step-generation_get-timeline-from-commands

.codecov.yml

@@ -2,13 +2,15 @@ ignore:
  - '**/node_modules'
  - 'protocol-library-kludge'
  - 'webpack-config'
+ - 'hardware-testing'
  - '**/*.md'
  - '**/*.yaml'
  - '**/Makefile'
  - '**/*.in'
  - '**/*.json'
  - '**/*.config.js'
  - '**/*.mk'
+ - '**/*.stories.tsx'
 
 comment:
  # add flags to `layout` configuration to show up in the PR comment
@@ -17,3 +19,10 @@ comment:
 flag_management:
  default_rules:
  carryforward: true
+
+coverage:
+ status:
+ project:
+ default:
+ target: auto
+ threshold: 10

.eslintignore

@@ -1,16 +1,11 @@
 **/node_modules/**
 **/coverage/**
-**/dist/**
+**/dist/**/*
+**/lib/**/*
 **/build/**
 **/venv/**
 .opentrons_config
 
-# typescript
-app-shell/lib/**
-discovery-client/lib/**
-**/lib/**/*.d.ts
-**/lib/**/*.json
-
 # prettier
 **/package.json
 **/CHANGELOG.md
@@ -32,3 +27,6 @@ update-server/**
 robot-server/**
 notify-server/**
 shared-data/python/**
+
+# app-testing don't format the json protocols
+app-testing/files

.eslintrc.js

@@ -4,7 +4,7 @@ module.exports = {
  root: true,
 
  parserOptions: {
- project: './tsconfig-eslint.json',
+ project: require('path').join(__dirname, 'tsconfig-eslint.json'),
  },
 
  extends: ['standard-with-typescript', 'plugin:react/recommended', 'prettier'],
@@ -88,7 +88,7 @@ module.exports = {
  '@typescript-eslint/consistent-type-assertions': 'off',
  '@typescript-eslint/no-var-requires': 'off',
  '@typescript-eslint/explicit-function-return-type': 'off',
-
+ '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',

.gitattributes

@@ -3,4 +3,5 @@
 # These files are binary and line endings should be left untouched
 *.hex binary
 *.bat binary
+*.gltf binary
 api/pypi-readme.rst text eol=lf

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,63 @@
+# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms#top-level-syntax
+name: Bug Report
+description: File a bug
+title: 'bug: '
+labels: [bug]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ ## Thanks for taking the time to file a bug!
+
+ > Please make sure you've read the "Opening Issues" section of our [Contributing Guide.](https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-issues)
+ - type: textarea
+ attributes:
+ label: Overview
+ description: |
+ Use this section to describe the bug at a high level.
+ Please include any issues you can find that may be related.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Steps to reproduce
+ description: |
+ List precise steps to reproduce the bug.
+ Please include screenshots, videos, and/or logs if possible.
+
+ Tip: You can attach files by clicking this area to highlight it and then dragging files in.
+ validations:
+ required: false
+ - type: textarea
+ attributes:
+ label: Current behavior
+ description: Describe how the software currently behaves and how that differs from how you think the software should behave.
+ validations:
+ required: false
+ - type: textarea
+ attributes:
+ label: Expected behavior
+ description: |
+ Describe how you think the software should behave.
+ validations:
+ required: false
+ - type: dropdown
+ attributes:
+ label: Operating system
+ description: What operating system are you running the app on?
+ multiple: false
+ options:
+ - Mac
+ - Windows
+ - Linux
+ - type: textarea
+ attributes:
+ label: System and robot setup or anything else?
+ description: |
+ Please share
+
+ - App version
+ - How you are connecting to your robot (Wi-Fi or USB)
+ - Any other context that may help us understand the bug
+ validations:
+ required: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,50 @@
+# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms#top-level-syntax
+name: Feature request
+description: Suggest a new feature
+title: 'feat: '
+labels: [feature-request]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ ## Thanks for taking the time to file a feature request!
+
+ > Please make sure you've read the "Opening Issues" section of our [Contributing Guide.](https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-issues)
+ - type: textarea
+ attributes:
+ label: Overview
+ description: |
+ Use this section to describe your idea at a high level.
+ Please include some context about why you want this feature.
+
+ - What would this feature allow you to accomplish?
+ - Are there any workarounds you use to partially achieve your goal?
+ - Are there any GitHub issues you could find that may be related?
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Implementation details
+ description: |
+ List any implementation steps, specs, links to docs, or files here.
+
+ Tip: You can attach files by clicking this area to highlight it and then dragging files in.
+ validations:
+ required: false
+ - type: textarea
+ attributes:
+ label: Design
+ description: |
+ Attach or link images and designs.
+
+ Tip: You can attach files by clicking this area to highlight it and then dragging files in.
+ validations:
+ required: false
+ - type: textarea
+ attributes:
+ label: Acceptance criteria
+ description: |
+ A checklist of requirements and/or testing steps that must be complete before this feature is considered complete.
+ This can also be used as a testing plan for associated PRs.
+ validations:
+ required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,6 +12,28 @@ To ensure your code is reviewed quickly and thoroughly, please fill out the sect
 Use this section to describe your pull-request at a high level. If the PR addresses any open issues, please tag the issues here.
 -->
 
+# Test Plan
+
+<!--
+Use this section to describe the steps that you took to test your Pull Request.
+If you did not perform any testing provide justification why.
+
+OT-3 Developers: You should default to testing on actual physical hardware.
+Once again, if you did not perform testing against hardware, justify why.
+
+Note: It can be helpful to write a test plan before doing development
+
+Example Test Plan (HTTP API Change)
+
+- Verified that new optional argument `dance-party` causes the robot to flash its lights, move the pipettes,
+then home.
+- Verified that when you omit the `dance-party` option the robot homes normally
+- Added protocol that uses `dance-party` argument to G-Code Testing Suite
+- Ran protocol that did not use `dance-party` argument and everything was successful
+- Added unit tests to validate that changes to pydantic model are correct
+
+-->
+
 # Changelog
 
 <!--

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

@@ -7,6 +7,7 @@ inputs:
  python-version:
  description: "What Python version to use to create the project's virtual environment"
  required: false
+ default: "false"
 runs:
  using: 'composite'
  steps:
@@ -16,9 +17,16 @@ runs:
  sudo apt-get update
  sudo apt-get install -y --no-install-recommends libsystemd-dev
  fi
+ - name: Set the OT_PYTHON env variable
+ shell: bash
+ run: echo "OT_PYTHON=$(which python)" >> $GITHUB_ENV
+ - name: If provided set the OT_VIRTUALENV_VERSION env variable
+ shell : bash
+ if: ${{ inputs.python-version != 'false' }}
+ run: echo "OT_VIRTUALENV_VERSION=${{ inputs.python-version }}" >> $GITHUB_ENV
  - shell: bash
  run: |
  npm install --global [email protected]
- pip install pipenv==2021.5.29
+ $OT_PYTHON -m pip install pipenv==2021.5.29
  - shell: bash
- run: 'make -C ${{ inputs.project }} setup OT_VIRTUALENV_VERSION=${{ inputs.python-version }}'
+ run: 'make -C ${{ inputs.project }} setup'