chore(hardware): add opentrons hardware package to ot 2 build #13770
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Make "python-can" an optional dependency for "opentrons_hardware" * Add "CAN" as an extra dependency for opentrons-hardware from the base opentrons pipfile * All "setup-ot2" targets just move python-can instead of the entire hardware package
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## edge #13770 +/- ##
=======================================
Coverage 70.96% 70.96%
=======================================
Files 2454 2454
Lines 69033 69033
Branches 8258 8258
=======================================
Hits 48986 48986
Misses 18095 18095
Partials 1952 1952
Flags with carried forward coverage won't be shown. Click here to find out more. |
vegano1
approved these changes
Oct 12, 2023
hardware/Config.in
Outdated
| @@ -0,0 +1,17 @@ | |||
| config BR2_PACKAGE_PYTHON_OPENTRONS_HARDWARE | |||
| bool "python-opentrons-system-server" | |||
hardware/Config.in
Outdated
| select BR2_PACKAGE_PYTHON_CLICK # runtime | ||
|
|
||
| help | ||
| Opentrons system HTTP server. Provides access to an OT-2 robot. |
There was a problem hiding this comment.
- hardware server
- OT-2 and Flex or maybe Opentrons robot?
sfoster1
requested changes
Oct 12, 2023
api/setup.py
Outdated
| @@ -60,6 +60,7 @@ def get_version(): | |||
| PACKAGES = find_packages(where="src") | |||
There was a problem hiding this comment.
can we see if we can make the extras thing transitive? like, add an extra to api that is 'flex-hardware' that requires opentrons_hardware["CAN"], an extra that is ot2-hardware that requires opentrons_hardware (maybe eventually opentrons_hardware["SERIAL"] or whatever). Then the pipfile for api installs opentrons["flex-hardware"].
The reason for this is that ideally we don't require hardware support for default in the api server.
There was a problem hiding this comment.
Yep this worked pretty nicely. Tested running all of the following and they seem to filter the packages correctly:
pipenv run pip install .--> no hardware packagepipenv run pip install ".[ot2-hardware]"--> opentrons_hardware without python-canpipenv run pip install ".[flex-hardware]"--> opentrons_hardware with python_can
- Updated the can-related extra requirement in opentrons_hardware to "flex" - Added extra requirements to API for either "ot2-hardware" or "flex-hardware"
|
Tested installing the Openembedded build on Flexy, everything is still in the right place and the server seems to be chugging along fine |
fsinapi
deleted the
RET-1380-Add-opentrons_hardware-package-to-OT-2-build
branch
y3rsh
added a commit
that referenced
this pull request
Oct 25, 2023
* edge: (77 commits) fix(app): update move gantry text in change pipette flow (#13712) fix(app): fix CI after release merge back (#13816) chore(hardware): add opentrons hardware package to ot 2 build (#13770) feat(protocol-designer): correct step count in create file wizard (#13807) feat(protocol-designer): error handling in create file wizard (#13804) fix(app): invalidate OT2 calibration queries when calibration flows complete (#13809) always jog (#13806) chore(app): point updates at dns not s3 (#13798) docs(api): updated Flex default flow rates (#13796) fix(api): Flag pipette as not ready to aspirate after pushing out air (#13728) fix(api, hardware): allow OT3Controller to disable tip motors (#13805) more blank trials; longer scale stabilize wait; submerge 2.5mm (#13788) fix(app): unload adapters after checking position of labware on adapter on heater shaker module (#13803) feat(app): wire up location conflict modal for ODD (#13797) feat(app): add Deck configuration page component (#13784) fix(robot-server): add default to robot serial (#13802) feat(protocol-designer, components): prep work for deck config in PD (#13775) feat(app, protocol-designer): plug in waste chute asset (#13800) fix(app): do not check mag block in calibration status (#13799) feat(protocol-designer): edit additional items staging area support (#13752) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
This PR, in conjunction with Opentrons/buildroot#209 adds the opentrons_hardware package to OT-2 builds. This is the beginning of plans to port most of the hardware-dependent code in the
opentronspackage over toopentrons_hardware. As of now, the package cannot actually be imported on the OT-2.Test Plan
Uploaded the build that was created from both this and the corresponding buildroot PR to an OT-2. Everything started up as normal, the app could still talk to the robot, and HTTP endpoints responded as normal. Hitting a Flex-specific endpoint still gets filtered out, with the error detail "No module named 'can'". SSH'd in and checked that the
opentrons_hardwarepackage was on the filesystem as expected.Changelog
setup-ot2targets removepython-caninstead of the entireopentrons_hardwarepackageReview requests
Risk assessment