Skip to content

Commit bced693

Browse files
mjhuffmjhuff
committed
Merge branch 'chore_release-9.0.0' into chore_9.0.0-incremental-merge-into-edge
2 parents 79cfdc5 + f50fca9 commit bced693

File tree

75 files changed

+23185
-5723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+23185
-5723
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.

‎analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[7583faec7c][OT2_X_v2_20_8_Overrides_InvalidConfigs_Override_return_tip_error].json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4932,7 +4932,7 @@
49324932
"errors": [
49334933
{
49344934
"createdAt": "TIMESTAMP",
4935-
"detail": "UnexpectedProtocolError [line 146]: Error 4000 GENERAL_ERROR (UnexpectedProtocolError): Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.29.",
4935+
"detail": "UnexpectedProtocolError [line 146]: Error 4000 GENERAL_ERROR (UnexpectedProtocolError): Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.28.",
49364936
"errorCode": "4000",
49374937
"errorInfo": {},
49384938
"errorType": "ExceptionInProtocolError",
@@ -4941,7 +4941,7 @@
49414941
"wrappedErrors": [
49424942
{
49434943
"createdAt": "TIMESTAMP",
4944-
"detail": "Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.29.",
4944+
"detail": "Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.28.",
49454945
"errorCode": "4000",
49464946
"errorInfo": {},
49474947
"errorType": "UnexpectedProtocolError",

‎analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[8b07e799f6][Flex_X_v2_20_96_and_8_Overrides_InvalidConfigs_Override_drop_tip_with_location].json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3779,7 +3779,7 @@
37793779
"errors": [
37803780
{
37813781
"createdAt": "TIMESTAMP",
3782-
"detail": "UnexpectedProtocolError [line 184]: Error 4000 GENERAL_ERROR (UnexpectedProtocolError): Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.29.",
3782+
"detail": "UnexpectedProtocolError [line 184]: Error 4000 GENERAL_ERROR (UnexpectedProtocolError): Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.28.",
37833783
"errorCode": "4000",
37843784
"errorInfo": {},
37853785
"errorType": "ExceptionInProtocolError",
@@ -3788,7 +3788,7 @@
37883788
"wrappedErrors": [
37893789
{
37903790
"createdAt": "TIMESTAMP",
3791-
"detail": "Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.29.",
3791+
"detail": "Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.28.",
37923792
"errorCode": "4000",
37933793
"errorInfo": {},
37943794
"errorType": "UnexpectedProtocolError",

‎analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[afd5d372a9][Flex_X_v2_20_96_and_8_Overrides_InvalidConfigs_Override_return_tip_error].json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3779,7 +3779,7 @@
37793779
"errors": [
37803780
{
37813781
"createdAt": "TIMESTAMP",
3782-
"detail": "UnexpectedProtocolError [line 180]: Error 4000 GENERAL_ERROR (UnexpectedProtocolError): Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.29.",
3782+
"detail": "UnexpectedProtocolError [line 180]: Error 4000 GENERAL_ERROR (UnexpectedProtocolError): Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.28.",
37833783
"errorCode": "4000",
37843784
"errorInfo": {},
37853785
"errorType": "ExceptionInProtocolError",
@@ -3788,7 +3788,7 @@
37883788
"wrappedErrors": [
37893789
{
37903790
"createdAt": "TIMESTAMP",
3791-
"detail": "Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.29.",
3791+
"detail": "Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.28.",
37923792
"errorCode": "4000",
37933793
"errorInfo": {},
37943794
"errorType": "UnexpectedProtocolError",

‎analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[b0ce7dde5d][Flex_X_v2_16_P1000_96_TC_PartialTipPickupTryToReturnTip].json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3713,7 +3713,7 @@
37133713
"errors": [
37143714
{
37153715
"createdAt": "TIMESTAMP",
3716-
"detail": "UnexpectedProtocolError [line 22]: Error 4000 GENERAL_ERROR (UnexpectedProtocolError): Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.29.",
3716+
"detail": "UnexpectedProtocolError [line 22]: Error 4000 GENERAL_ERROR (UnexpectedProtocolError): Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.28.",
37173717
"errorCode": "4000",
37183718
"errorInfo": {},
37193719
"errorType": "ExceptionInProtocolError",
@@ -3722,7 +3722,7 @@
37223722
"wrappedErrors": [
37233723
{
37243724
"createdAt": "TIMESTAMP",
3725-
"detail": "Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.29.",
3725+
"detail": "Cannot return tip to a tip rack while the pipette is configured for partial tip before API version 2.28.",
37263726
"errorCode": "4000",
37273727
"errorInfo": {},
37283728
"errorType": "UnexpectedProtocolError",

0 commit comments

Comments
 (0)