Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(hardware): constants from firmware #8995

Merged
merged 3 commits into from
Dec 7, 2021

Conversation

sfoster1
Copy link
Member

@sfoster1 sfoster1 commented Dec 6, 2021

Make hardware rely on opentrons-ot3-firmware.

This adds a pipenv git dependency which means you'll have to re-run install a lot. It needs to be editable but that needs some changes to the pyproject.toml itself (which perhaps indicates a failing of the system).

For now, this will probably work.

Pipenv can add git repo dependencies, so we can add the
opentrons_ot3_firmware repo here.

If you want to switch branches you can edit the pipfile (there's not
really a better way to do this).

This will become a problem if we ever want to depend on this module and
get its transitive dependencies because that stuff only reads setup.py,
but we don't really do that yet.
This lets us take a bunch of code out how nice
@sfoster1 sfoster1 marked this pull request as ready for review December 7, 2021 17:35
@sfoster1 sfoster1 requested review from a team as code owners December 7, 2021 17:35
@codecov
Copy link

codecov bot commented Dec 7, 2021

Codecov Report

Merging #8995 (4ce133e) into edge (be485fe) will increase coverage by 0.01%.
The diff coverage is 67.64%.

Impacted file tree graph

@@            Coverage Diff             @@
##             edge    #8995      +/-   ##
==========================================
+ Coverage   74.72%   74.74%   +0.01%     
==========================================
  Files        1860     1861       +1     
  Lines       49407    49573     +166     
  Branches     4857     4931      +74     
==========================================
+ Hits        36918    37051     +133     
- Misses      11644    11669      +25     
- Partials      845      853       +8     
Flag Coverage Δ
app 69.95% <52.94%> (+0.11%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...otocolSetup/LabwarePositionCheck/SummaryScreen.tsx 76.31% <ø> (+5.94%) ⬆️
...up/LabwarePositionCheck/hooks/useLabwareOffsets.ts 10.00% <0.00%> (ø)
...warePositionCheck/hooks/useLabwarePositionCheck.ts 7.32% <0.00%> (-0.12%) ⬇️
...p/RunSetupCard/LabwareSetup/LabwareInfoOverlay.tsx 86.95% <0.00%> (ø)
hardware/opentrons_hardware/scripts/move.py 0.00% <0.00%> (ø)
...PositionCheck/utils/getLatestLabwareOffsetCount.ts 100.00% <100.00%> (ø)
...ms/ProtocolSetup/utils/getLabwareOffsetLocation.ts 100.00% <100.00%> (ø)
...are/opentrons_hardware/drivers/can_bus/__init__.py 100.00% <100.00%> (ø)
...pentrons_hardware/drivers/can_bus/can_messenger.py 86.27% <100.00%> (ø)
...dware/opentrons_hardware/drivers/can_bus/driver.py 83.63% <100.00%> (ø)
... and 26 more

Copy link
Contributor

@amitlissack amitlissack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. As long as we aren't losing anything from #8772

Copy link
Contributor

@Laura-Danielle Laura-Danielle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@sfoster1 sfoster1 merged commit 2205bfb into edge Dec 7, 2021
@sfoster1 sfoster1 deleted the chore_constants-from-firmware branch December 7, 2021 20:31
sfoster1 added a commit that referenced this pull request Dec 7, 2021
sfoster1 added a commit that referenced this pull request Dec 7, 2021
* Revert "refactor(hardware): constants from firmware (#8995)"

This reverts commit 2205bfb.

* chore(ci): robot-server and api build on hw changes
sfoster1 added a commit that referenced this pull request Dec 7, 2021
* chore(hardware): add firmware python module as dep

Pipenv can add git repo dependencies, so we can add the
opentrons_ot3_firmware repo here.

If you want to switch branches you can edit the pipfile (there's not
really a better way to do this).

This will become a problem if we ever want to depend on this module and
get its transitive dependencies because that stuff only reads setup.py,
but we don't really do that yet.

* chore(hardware): rely on constants from firmware

This lets us take a bunch of code out how nice

* add pushing to ot3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants