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

chore(release): Merge v8.2.0-alpha.4 into edge #16981

Merged
merged 25 commits into from
Nov 26, 2024

Conversation

SyntaxColoring
Copy link
Contributor

@SyntaxColoring SyntaxColoring commented Nov 26, 2024

Overview

Merge the latest release alpha into edge.

Test Plan and Hands on Testing

None.

Changelog

Conflicts:

api/src/opentrons/protocol_engine/commands/absorbance_reader/read.py:

Conflict in error message wording between PR #16941 in release and PR #16920 in edge. I took the one in release because the one in edge was an outdated cherry pick.

app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts:

Just import statements.

app/src/organisms/DropTipWizardFlows/hooks/useTipAttachmentStatus/getPipettesWithTipAttached.ts:

Release (PR #16893) removed cursor: null and includeFixitCommands: null from some network requests, leaving those fields unspecified instead. Edge (PR #16904) deleted this whole file in favor of a different one. I removed cursor: null from the new file; includeFixitCommands: null was already removed.

Review requests

  • Do the resolutions described above seem right?
  • Any conflicts that Git might have missed?

Risk assessment

Medium risk. There might be more stuff like the cursor: null thing lurking about.

mjhuff and others added 24 commits November 18, 2024 19:31
…16884)

Closes RQA-3583

Currently, the app inspects an errorType on a failed drop tip command to determine whether to throw the special case "home the gantry" error modal. Recently, the error type changed for failed update estimator commands, so the special modal was broken. Instead of special-casing the errorType for failed estimator commands, let's just assume that any failed estimator command is caused by an unknown position error and pop the special modal.

Note that this also handles any error in the same manner with a "MustHomeError" errorType, too.
# Overview

Known issue for downgrading below 8.2 with a plate reader attached.

## Test Plan and Hands on Testing

Check in next alpha.

## Changelog

Single bullet in API release notes.

## Review requests

- Does this capture the issue properly? Is there a related app-side
issue?
- Do we need to mention the problem of downgrading a robot _on the same
network_ as a plate reader?

## Risk assessment

nil
# Overview

Prettier (or whatever runs in our JS lint action) demands a newline
after a markdown header. OK.

## Test Plan and Hands on Testing

Pass automated tests plz.

## Changelog

`\n`

## Review requests

Forgive this shameful and time-wasting PR.

## Risk assessment

none
…id_auto_seal_lid to release (#16903)

Covers RABR-669
Adds compatibility between `biorad_96_wellplate_200ul_pcr` and `opentrons_tough_pcr_auto_sealing_lid` with stacking z offset
…al place (#16919)

Covers EXEC-1019
Ensure the plate reader values are truncated to the third decimal place after being read during a protocol.
Closes RQA-3645

Recent gripper firmware changes add new degrees of G axis "home" state, and this ultimately causes the unsafe/ungripLabware command to fail, since a successful completion of the ungrip does not set the HOME flag. Because we ultimately want to ungrip the labware AND home the gripper G axis, let's use a parameterized home command instead.
* fix(components): fix unit text wrap-issue
…losed (#16941)

Covers RABR-674
Raises  an error during analysis when the plate reader lid is not closed and a read is attempted.
…#16954)

Closes RQA-3643

Because drop tip flows is no longer deterministic, we shouldn't show the progress bar and step counter.
…e recovery policies during a run (#16950)

Closes RQA-3670

We need to support the client ignoring several different classes of errors in a single run, which means the app needs to know the current recovery policy and be able to modify. This PR adds the necessary infrastructure to support that.

Co-authored-by: Max Marrone <max@opentrons.com>
Conflicts:

api/src/opentrons/protocol_engine/commands/absorbance_reader/read.py:
Conflict in error message wording between PR #16941 in release and PR #16920 in edge. I took the one in release because the one in edge was an outdated cherry pick.

app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts:
Just import statements.

app/src/organisms/DropTipWizardFlows/hooks/useTipAttachmentStatus/getPipettesWithTipAttached.ts:
Release removed `cursor: null` and `includeFixitCommands: null` from some network requests, leaving those fields unspecified instead (PR ##16893). Edge deleted this whole file in favor of a different one (PR #16904). I removed `cursor: null` from the new file; `includeFixitCommands: null` was already removed.
Copy link
Contributor

@mjhuff mjhuff left a comment

Choose a reason for hiding this comment

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

conflict resolutions lgtm! app changes seem good too. thank you! there may be a few lint things to clean up but it should be straightfoward 👍

@SyntaxColoring SyntaxColoring marked this pull request as ready for review November 26, 2024 15:28
@SyntaxColoring SyntaxColoring requested review from a team as code owners November 26, 2024 15:28
@SyntaxColoring SyntaxColoring requested review from smb2268 and removed request for a team November 26, 2024 15:28
Copy link

codecov bot commented Nov 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.21%. Comparing base (d5b7e61) to head (90f0c03).
Report is 47 commits behind head on edge.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #16981      +/-   ##
==========================================
+ Coverage   73.90%   79.21%   +5.30%     
==========================================
  Files          43      120      +77     
  Lines        3231     4517    +1286     
==========================================
+ Hits         2388     3578    +1190     
- Misses        843      939      +96     
Flag Coverage Δ
g-code-testing 92.43% <ø> (?)
shared-data 73.96% <100.00%> (+0.05%) ⬆️

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

Files with missing lines Coverage Δ
...rons_shared_data/pipette/mutable_configurations.py 88.71% <100.00%> (+0.69%) ⬆️

... and 77 files with indirect coverage changes

@SyntaxColoring SyntaxColoring merged commit 58903d4 into edge Nov 26, 2024
72 checks passed
@SyntaxColoring SyntaxColoring deleted the merge_release_820_into_edge branch November 26, 2024 17:12
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.

9 participants