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: 7.1.0 mergeback into edge from Alpha.7 #14198

Merged
merged 55 commits into from
Dec 14, 2023

Conversation

jerader
Copy link
Collaborator

@jerader jerader commented Dec 14, 2023

Overview

Merge 7.1.0 back into edge so the changes with the latest drop tip command are in Protocol Designer.

ecormany and others added 30 commits December 7, 2023 10:00
refetches the deck config on a 5 second interval on the device details page and in hooks that
determine location conflicts

closes RQA-1993
* fix(app): fix styling of read-only deck configurator

closes RQA-1987
* feat(app): add deck config option to device reset
…LPC (#14126)

Uses the new verify tip presence command to check that the calibration probe is present where relevant instead of getting tip status data from /instruments.

---------

Co-authored-by: Seth Foster <[email protected]>
updates pipetteNameSpecs flowRates to match version 2 definitions
… v4 (#14078)

implements the v4 version of deck location select for OT-2. used by drop tip wizard. uses v3
DeckFromLayers in the same way as BaseDeck.

closes RQA-1951
…and (#14139)

Drop tip flows require saving pipette positions without homing the plunger axis (we definitely do
not want to home the plunger). The save_position command should optionally expose a failOnNotHomed
parameter to prevent an error from being thrown when the plunger is not homed.
…14133)

* Delete unused stuff in _waste_chute_dimensions.
* Delete unused with_staging_area_slot_d4 arg.
filters the labware location combos generated by getLabwareLocationCombos by Flex or OT-2 single
slot addressable area name, to exclude labware in staging area slots as LPC options

closes RQA-1989
…view (#14149)

fixes several TODOs that were left in the Protocol Engine AddressableAreaStore and AddressableAreaView during initial development
* fix(app): remove probe check from module cal

Module calibration doesn't require a pipette id and thus none is
available here (and in general I believe you can do it with a gripper)
so this isn't really an appropriate check.

* this was new too whoops probably should have been a sign
… container structure (#14145)

Fixes issues introduced to 2,16 protocols for OT2 and 2,15 and prior protocols for OT2 and Flex
…etup (#14144)

* fix(app): properly display no liquids used text in protocol details/setup

closes RQA-2006
adds the necessary processing to useDeckConfigurationCompatibility to surface a required protocol
single slot fixture conflict and provide the missing on-deck labware display name for that single
slot. updates ODD FixtureTable to fix a location conflict modal bug where incorrect data was shown
in the modal when multiple location conflicts exist

closes RAUT-885, RQA-1985
* fix(app): fix module calibration selection slot issue
…iner not being a Labware anymore (#14171)

* Delete dead code.

* Account for .trash_container being a non-Labware.
)

Closes RQA-2013

Clicking the error banner within ProtcolRunHeader has the behavior of clearing the current run, but
this behavior is not desired. First, it actually unrenders the error banner, and second, all
conditional rendering tied to the current run (such as the drop tip banner) are unrendered as well.
brenthagen and others added 16 commits December 12, 2023 16:53
replaces the existing fixture conflict chevron with a resolve or configure button

closes RAUT-900
* fix(app): fix dqa ODD protocol setup deck config
…while maintaining OT2 behavior (#14182)

Removes the automatic drop tip behavior from do_stop_and_recover for Flex protocols while retaining OT2 behavior
* fix(app): fix module calibration wizard copy
* fix(components): fix storybook deck configurator
* fix(app): update error messaging for module calibration

fix RQA-2084
…14197)

Prevent bug where odd will not proceed past protocol setup screen because of lack of completed
analysis

RQA-2074
@jerader jerader requested review from a team as code owners December 14, 2023 13:20
@jerader jerader requested a review from a team December 14, 2023 13:20
@jerader jerader requested a review from a team as a code owner December 14, 2023 13:20
@jerader jerader requested review from b-cooper and removed request for a team December 14, 2023 13:20
Copy link

codecov bot commented Dec 14, 2023

Codecov Report

Merging #14198 (59b436a) into edge (d15b22e) will increase coverage by 0.08%.
The diff coverage is 50.31%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #14198      +/-   ##
==========================================
+ Coverage   70.39%   70.47%   +0.08%     
==========================================
  Files        2510     2512       +2     
  Lines       71194    71137      -57     
  Branches     8973     8946      -27     
==========================================
+ Hits        50117    50134      +17     
+ Misses      18883    18809      -74     
  Partials     2194     2194              
Flag Coverage Δ
app 67.64% <51.96%> (+<0.01%) ⬆️

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

Files Coverage Δ
...entrons/hardware_control/backends/ot3controller.py 68.26% <ø> (+0.40%) ⬆️
api/src/opentrons/hardware_control/ot3api.py 79.58% <ø> (ø)
...i/src/opentrons/protocol_api/instrument_context.py 89.65% <ø> (+0.24%) ⬆️
api/src/opentrons/protocol_api/protocol_context.py 92.30% <ø> (ø)
...c/opentrons/protocol_engine/clients/sync_client.py 100.00% <ø> (ø)
...src/opentrons/protocol_engine/commands/__init__.py 100.00% <ø> (ø)
...entrons/protocol_engine/commands/command_unions.py 100.00% <ø> (ø)
...opentrons/protocol_engine/commands/load_labware.py 100.00% <ø> (ø)
.../opentrons/protocol_engine/commands/load_module.py 100.00% <ø> (ø)
...pentrons/protocol_engine/commands/save_position.py 100.00% <ø> (ø)
... and 67 more

... and 42 files with indirect coverage changes

useInstrumentsQuery,
} from '@opentrons/react-api-client'
LEFT,
MotorAxes,
Copy link
Contributor

Choose a reason for hiding this comment

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

nit

import type { MotorAxes } from '@opentrons/shared-data'

Copy link
Contributor

@koji koji left a comment

Choose a reason for hiding this comment

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

The frontend part looks good to me.
For Deck Configuration part, waiting for Brent's review would be great.

Copy link
Contributor

@SyntaxColoring SyntaxColoring left a comment

Choose a reason for hiding this comment

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

RSS stuff should be good. From the commit logs, I don't think there's been an opportunity for much conflict.

@jerader jerader merged commit 59b436a into edge Dec 14, 2023
81 of 84 checks passed
@jerader jerader deleted the chore_7.1.0-mergeback-into-edge branch December 14, 2023 16:58
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.