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

feat(shared-data, api, hardware-testing): add the p200_96 #17105

Merged
merged 10 commits into from
Jan 14, 2025

Conversation

ryanthecoder
Copy link
Contributor

Overview

This pulls in the changes from several different hardware-testing branches/tags that have diverged in the factory and includes all the work for the p200_96 that has happened on those branches.

Test Plan and Hands on Testing

Changelog

Review requests

Risk assessment

@ryanthecoder ryanthecoder force-pushed the EXEC-1055-96ch-lv-clean branch from cd85378 to 1e10ec6 Compare December 16, 2024 18:53
Copy link

codecov bot commented Dec 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.00%. Comparing base (906d841) to head (1e10ec6).
Report is 38 commits behind head on edge.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##             edge   #17105       +/-   ##
===========================================
- Coverage   92.43%   74.00%   -18.44%     
===========================================
  Files          77       43       -34     
  Lines        1283     3250     +1967     
===========================================
+ Hits         1186     2405     +1219     
- Misses         97      845      +748     
Flag Coverage Δ
g-code-testing ?
shared-data 74.00% <100.00%> (?)

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

Files with missing lines Coverage Δ
.../python/opentrons_shared_data/pipette/load_data.py 87.93% <100.00%> (ø)

... and 119 files with indirect coverage changes

@ryanthecoder ryanthecoder force-pushed the EXEC-1055-96ch-lv-clean branch from 05b9470 to c3f119f Compare December 20, 2024 16:18
@ryanthecoder ryanthecoder marked this pull request as ready for review January 13, 2025 19:53
@ryanthecoder ryanthecoder requested review from a team as code owners January 13, 2025 19:53
@ryanthecoder ryanthecoder requested review from koji and removed request for a team January 13, 2025 19:53
Copy link
Member

@sfoster1 sfoster1 left a comment

Choose a reason for hiding this comment

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

Sweet!

# for offset in LABWARE_OFFSETS:
# ui.print_info(f"\t{offset.createdAt}:")
# ui.print_info(f"\t\t{offset.definitionUri}")
# ui.print_info(f"\t\t{offset.vector}")
Copy link
Contributor

Choose a reason for hiding this comment

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

did you want to keep this commented code

@@ -191,6 +192,8 @@ def _record_measurement_and_store(m_type: MeasurementType) -> EnvironmentData:
)

_record_measurement_and_store(MeasurementType.ASPIRATE)
if not trial.ctx.is_simulating():
Copy link
Contributor

Choose a reason for hiding this comment

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

what is this for?

print(f"pip_size:{pip_size}")
print(f"pipette channels :{pipette.channels}")
print(f"tip volume :{tip_volume}")
# pip_size = 50 if "50" in pipette.name else 1000
Copy link
Contributor

Choose a reason for hiding this comment

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

commented code

print(f"pip_size:{pip_size}")
print(f"pipette channels :{pipette.channels}")
print(f"tip volume :{tip_volume}")
# pip_size = 50 if "50" in pipette.name else 1000
Copy link
Contributor

Choose a reason for hiding this comment

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

here too

@@ -96,7 +95,7 @@ def _offset_applies_to_labware(_o: dict) -> bool:
return False
offset_uri = _o["definitionUri"]
if offset_uri[0:-1] != lw_uri[0:-1]: # drop schema version number
ui.print_info(f"{_o} does not apply {offset_uri} != {lw_uri}")
# ui.print_info(f"{_o} does not apply {offset_uri} != {lw_uri}")
Copy link
Contributor

Choose a reason for hiding this comment

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

commented code

Copy link
Contributor

@caila-marashaj caila-marashaj left a comment

Choose a reason for hiding this comment

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

there's some leftover commented code but otherwise makes sense to me

@ryanthecoder ryanthecoder merged commit a95a156 into edge Jan 14, 2025
45 checks passed
caila-marashaj pushed a commit that referenced this pull request Feb 11, 2025
<!--
Thanks for taking the time to open a Pull Request (PR)! Please make sure
you've read the "Opening Pull Requests" section of our Contributing
Guide:

https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-pull-requests

GitHub provides robust markdown to format your PR. Links, diagrams,
pictures, and videos along with text formatting make it possible to
create a rich and informative PR. For more information on GitHub
markdown, see:

https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax

To ensure your code is reviewed quickly and thoroughly, please fill out
the sections below to the best of your ability!
-->

This pulls in the changes from several different hardware-testing
branches/tags that have diverged in the factory and includes all the
work for the p200_96 that has happened on those branches.

<!--
Describe your PR at a high level. State acceptance criteria and how this
PR fits into other work. Link issues, PRs, and other relevant resources.
-->

<!--
Describe your testing of the PR. Emphasize testing not reflected in the
code. Attach protocols, logs, screenshots and any other assets that
support your testing.
-->

<!--
List changes introduced by this PR considering future developers and the
end user. Give careful thought and clear documentation to breaking
changes.
-->

<!--
- What do you need from reviewers to feel confident this PR is ready to
merge?
- Ask questions.
-->

<!--
- Indicate the level of attention this PR needs.
- Provide context to guide reviewers.
- Discuss trade-offs, coupling, and side effects.
- Look for the possibility, even if you think it's small, that your
change may affect some other part of the system.
- For instance, changing return tip behavior may also change the
behavior of labware calibration.
- How do your unit tests and on hands on testing mitigate this PR's
risks and the risk of future regressions?
- Especially in high risk PRs, explain how you know your testing is
enough.
-->

---------

Co-authored-by: Andiiiiiiyy <[email protected]>
caila-marashaj pushed a commit that referenced this pull request Mar 19, 2025
<!--
Thanks for taking the time to open a Pull Request (PR)! Please make sure
you've read the "Opening Pull Requests" section of our Contributing
Guide:

https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-pull-requests

GitHub provides robust markdown to format your PR. Links, diagrams,
pictures, and videos along with text formatting make it possible to
create a rich and informative PR. For more information on GitHub
markdown, see:

https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax

To ensure your code is reviewed quickly and thoroughly, please fill out
the sections below to the best of your ability!
-->

This pulls in the changes from several different hardware-testing
branches/tags that have diverged in the factory and includes all the
work for the p200_96 that has happened on those branches.

<!--
Describe your PR at a high level. State acceptance criteria and how this
PR fits into other work. Link issues, PRs, and other relevant resources.
-->

<!--
Describe your testing of the PR. Emphasize testing not reflected in the
code. Attach protocols, logs, screenshots and any other assets that
support your testing.
-->

<!--
List changes introduced by this PR considering future developers and the
end user. Give careful thought and clear documentation to breaking
changes.
-->

<!--
- What do you need from reviewers to feel confident this PR is ready to
merge?
- Ask questions.
-->

<!--
- Indicate the level of attention this PR needs.
- Provide context to guide reviewers.
- Discuss trade-offs, coupling, and side effects.
- Look for the possibility, even if you think it's small, that your
change may affect some other part of the system.
- For instance, changing return tip behavior may also change the
behavior of labware calibration.
- How do your unit tests and on hands on testing mitigate this PR's
risks and the risk of future regressions?
- Especially in high risk PRs, explain how you know your testing is
enough.
-->

---------

Co-authored-by: Andiiiiiiyy <[email protected]>
ryanthecoder added a commit that referenced this pull request Mar 19, 2025
<!--
Thanks for taking the time to open a Pull Request (PR)! Please make sure
you've read the "Opening Pull Requests" section of our Contributing
Guide:

https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-pull-requests

GitHub provides robust markdown to format your PR. Links, diagrams,
pictures, and videos along with text formatting make it possible to
create a rich and informative PR. For more information on GitHub
markdown, see:

https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax

To ensure your code is reviewed quickly and thoroughly, please fill out
the sections below to the best of your ability!
-->

This pulls in the changes from several different hardware-testing
branches/tags that have diverged in the factory and includes all the
work for the p200_96 that has happened on those branches.

<!--
Describe your PR at a high level. State acceptance criteria and how this
PR fits into other work. Link issues, PRs, and other relevant resources.
-->

<!--
Describe your testing of the PR. Emphasize testing not reflected in the
code. Attach protocols, logs, screenshots and any other assets that
support your testing.
-->

<!--
List changes introduced by this PR considering future developers and the
end user. Give careful thought and clear documentation to breaking
changes.
-->

<!--
- What do you need from reviewers to feel confident this PR is ready to
merge?
- Ask questions.
-->

<!--
- Indicate the level of attention this PR needs.
- Provide context to guide reviewers.
- Discuss trade-offs, coupling, and side effects.
- Look for the possibility, even if you think it's small, that your
change may affect some other part of the system.
- For instance, changing return tip behavior may also change the
behavior of labware calibration.
- How do your unit tests and on hands on testing mitigate this PR's
risks and the risk of future regressions?
- Especially in high risk PRs, explain how you know your testing is
enough.
-->

---------

Co-authored-by: Andiiiiiiyy <[email protected]>
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.

4 participants