Skip to content

Commit 75b804d

Browse files
chore: Merge chore_release-8.9.0@6523438c2b with chore_release-9.0.0@d9a5db020d
This is part of an incremental mergeback of chore_release-8.9.0 into chore_release-9.0.0. Manual conflict resolutions: app-shell/build/release-notes.md: Both branches add new release notes at the top for v8.9.0 and v9.0.0, respectively. Include 'em both, in the proper order. app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/__tests__/ProtocolSetupCamera.test.tsx, app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/index.tsx: Both branches modify the same tests, for something camera-related and something snackbar-related. Include both branches' additions. hardware-testing/hardware_testing/gravimetric/protocol_replacement/gravimetric.py: A conflict related to what is the latest apiLevel. Take v9.0.0's version.
2 parents 997a5c4 + 6523438 commit 75b804d

File tree

30 files changed

+964
-103
lines changed

30 files changed

+964
-103
lines changed

__mock-app-path__/protocols/12345.json

Whitespace-only changes.

__mock-app-path__/protocols/not_a_number.json

Whitespace-only changes.

__mock-app-path__/protocols/protocol_item_1/analysis/fake_timestamp0.json

Whitespace-only changes.

__mock-app-path__/protocols/protocol_item_1/src/main.py

Whitespace-only changes.

__mock-app-path__/protocols/protocol_item_2/analysis/fake_timestamp1.json

Whitespace-only changes.

__mock-app-path__/protocols/protocol_item_2/src/main.json

Whitespace-only changes.

api/release-notes.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ Welcome to the v9.0.0 release of the Opentrons robot software! This release incl
2424

2525
---
2626

27+
## Opentrons Robot Software Changes in 8.9.0
28+
29+
Welcome to the v8.9.0 release of the Opentrons robot software!
30+
31+
This release includes support for Opentrons Flex 20 µL pipette tips. The tips are fully compatible with [liquid class](https://docs.opentrons.com/python-api/liquid-classes/) commands and with Flex 1- and 8-Channel (1-50 µL range) and 96-Channel (1-200 µL range) pipettes.
32+
2733
## Opentrons Robot Software Changes in 8.8.1
2834

2935
The 8.8.1 hotfix release includes a small fix to allow all robots to properly boot after a recent upgrade.

api/src/opentrons/protocol_api/core/engine/_default_labware_versions.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,12 @@
149149
"corning_96_wellplate_360ul_lid": 2,
150150
"corning_falcon_384_wellplate_130ul_flat_lid": 2,
151151
"ibidi_96_square_well_plate_300ul_lid": 2,
152+
"agilent_1_reservoir_290ml": 5,
153+
"nest_1_reservoir_195ml": 5,
154+
"nest_1_reservoir_290ml": 5,
155+
"opentrons_tough_12_reservoir_22ml": 2,
156+
"opentrons_tough_1_reservoir_300ml": 2,
157+
"usascientific_12_reservoir_22ml": 5,
152158
},
153159
}
154160

app-shell/build/release-notes.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@ Welcome to the v9.0.0 release of the Opentrons App! This release includes protoc
3939

4040
---
4141

42+
## Opentrons App Changes in 8.9.0
43+
44+
Welcome to the v8.9.0 release of the Opentrons App! This release updates quick transfer protocols with the same features as any other Flex protocol:
45+
46+
- Go to the Protocols tab on the touchscreen to start a quick transfer.
47+
- Find completed quick transfers in the Protocols tab.
48+
- Pin a quick transfer protocol to find it easily.
49+
50+
---
51+
4252
## Opentrons App Changes in 8.8.1
4353

4454
There are no changes to the Opentrons App in v8.8.1.

app/src/assets/localization/en/protocol_setup.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"camera": "Camera",
4949
"camera_disabled": "Camera disabled",
5050
"camera_enabled": "Camera enabled",
51+
"camera_required": "Camera is required to run this protocol",
5152
"camera_settings": "camera settings",
5253
"camera_setup_step_description": "Review camera preferences for this protocol run.",
5354
"camera_setup_step_title": "Camera",

0 commit comments

Comments
 (0)