From 3f5c054652f7c2f5e48f6eb70920c72a3aaee1e5 Mon Sep 17 00:00:00 2001 From: amit lissack Date: Tue, 9 Nov 2021 13:26:23 -0500 Subject: [PATCH 1/3] faster g-code-tests in ci --- .../protocol/protocol_configurations.py | 9 +++++++-- .../protocol/protocols/2_modules_1s_1m_v2.py | 2 +- .../protocol/protocols/swift_smoke.py | 13 +++++++------ .../protocol/protocols/swift_turbo.py | 11 ++++++----- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/g-code-testing/g_code_test_data/protocol/protocol_configurations.py b/g-code-testing/g_code_test_data/protocol/protocol_configurations.py index 96485d03a6c..bc2db9828a9 100644 --- a/g-code-testing/g_code_test_data/protocol/protocol_configurations.py +++ b/g-code-testing/g_code_test_data/protocol/protocol_configurations.py @@ -15,9 +15,14 @@ smoothie=SmoothieSettings( left=PipetteSettings(model="p20_single_v2.0", id="P20SV202020070101"), right=PipetteSettings(model="p300_multi_v2.1", id="P20SV202020070101"), - ) + ), ) +# Set up the temperature ramp. +SWIFT_SMOOTHIE_SETTINGS.thermocycler.lid_temperature.degrees_per_tick = 50 +SWIFT_SMOOTHIE_SETTINGS.thermocycler.plate_temperature.degrees_per_tick = 50 +SWIFT_SMOOTHIE_SETTINGS.tempdeck.temperature.degrees_per_tick = 50 + S3_BASE: Final = "protocol" """Base path of files in s3.""" @@ -59,7 +64,7 @@ smoothie=SmoothieSettings( left=PipetteSettings(model="p300_single_v2.1", id="P20SV202020070101"), right=PipetteSettings(model="p20_multi_v2.1", id="P20SV202020070101"), - ) + ), ) ) diff --git a/g-code-testing/g_code_test_data/protocol/protocols/2_modules_1s_1m_v2.py b/g-code-testing/g_code_test_data/protocol/protocols/2_modules_1s_1m_v2.py index 7ac83f9a522..a04afebfce3 100644 --- a/g-code-testing/g_code_test_data/protocol/protocols/2_modules_1s_1m_v2.py +++ b/g-code-testing/g_code_test_data/protocol/protocols/2_modules_1s_1m_v2.py @@ -31,7 +31,7 @@ def run(ctx): # Magnetic Module Testing magdeck.engage(height=10) - ctx.delay(seconds=30) + ctx.delay(seconds=1) magdeck.disengage() ctx.comment(f"mag status {magdeck.status}") magdeck.engage() diff --git a/g-code-testing/g_code_test_data/protocol/protocols/swift_smoke.py b/g-code-testing/g_code_test_data/protocol/protocols/swift_smoke.py index b076648e629..f1515bd67ce 100644 --- a/g-code-testing/g_code_test_data/protocol/protocols/swift_smoke.py +++ b/g-code-testing/g_code_test_data/protocol/protocols/swift_smoke.py @@ -82,8 +82,9 @@ def run(protocol_context): # Run Enzymatic Prep Profile thermocycler.close_lid() thermocycler.set_block_temperature(70) - thermocycler.set_block_temperature(32, hold_time_minutes=1) - thermocycler.set_block_temperature(64.5, hold_time_minutes=1) + # Changed from hold_time_minutes to hold_time_seconds for faster running in CI + thermocycler.set_block_temperature(32, hold_time_seconds=1) + thermocycler.set_block_temperature(64.5, hold_time_seconds=1) thermocycler.set_block_temperature(4) thermocycler.deactivate_lid() thermocycler.open_lid() @@ -271,10 +272,10 @@ def run(protocol_context): COVER_TEMP = 105 PLATE_TEMP_PRE = 4 - PLATE_TEMP_HOLD_1 = (97, 5) # 30) - PLATE_TEMP_HOLD_2 = (97, 5) # 10) - PLATE_TEMP_HOLD_3 = (59.5, 5) # 30) - PLATE_TEMP_HOLD_4 = (67.3, 5) # 30) + PLATE_TEMP_HOLD_1 = (97, 1) # 30) + PLATE_TEMP_HOLD_2 = (97, 1) # 10) + PLATE_TEMP_HOLD_3 = (59.5, 1) # 30) + PLATE_TEMP_HOLD_4 = (67.3, 1) # 30) # PLATE_TEMP_HOLD_5 = (72, 300) PLATE_TEMP_POST = 4 NUM_CYCLES = 5 diff --git a/g-code-testing/g_code_test_data/protocol/protocols/swift_turbo.py b/g-code-testing/g_code_test_data/protocol/protocols/swift_turbo.py index ccc1d8c18fa..6dbbde11219 100644 --- a/g-code-testing/g_code_test_data/protocol/protocols/swift_turbo.py +++ b/g-code-testing/g_code_test_data/protocol/protocols/swift_turbo.py @@ -110,7 +110,8 @@ def run(protocol_context): p20.blow_out(well.top(-7)) p20.drop_tip() - thermocycler.set_block_temperature(20.2, hold_time_minutes=2) + # Changed from hold_time_minutes to hold_time_seconds for faster running in CI + thermocycler.set_block_temperature(20.2, hold_time_seconds=1) thermocycler.set_block_temperature(4) """Ligation Purification""" @@ -272,10 +273,10 @@ def run(protocol_context): COVER_TEMP = 105 PLATE_TEMP_PRE = 4 - PLATE_TEMP_HOLD_1 = (97, 2) # 30) - PLATE_TEMP_HOLD_2 = (97, 2) # 10) - PLATE_TEMP_HOLD_3 = (59.5, 2) # 30) - PLATE_TEMP_HOLD_4 = (67.3, 2) # 30) + PLATE_TEMP_HOLD_1 = (97, 1) # 30) + PLATE_TEMP_HOLD_2 = (97, 1) # 10) + PLATE_TEMP_HOLD_3 = (59.5, 1) # 30) + PLATE_TEMP_HOLD_4 = (67.3, 1) # 30) # PLATE_TEMP_HOLD_5 = (72, 300) PLATE_TEMP_POST = 4 NUM_CYCLES = 5 From 410e743e139a6db8b9da4fc4daa22f1e5d3dc263 Mon Sep 17 00:00:00 2001 From: amit lissack Date: Tue, 9 Nov 2021 13:36:08 -0500 Subject: [PATCH 2/3] reduce hold time. --- .../g_code_test_data/protocol/protocols/swift_turbo.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/g-code-testing/g_code_test_data/protocol/protocols/swift_turbo.py b/g-code-testing/g_code_test_data/protocol/protocols/swift_turbo.py index 6dbbde11219..2d8cc1d8747 100644 --- a/g-code-testing/g_code_test_data/protocol/protocols/swift_turbo.py +++ b/g-code-testing/g_code_test_data/protocol/protocols/swift_turbo.py @@ -83,8 +83,9 @@ def run(protocol_context): # Run Enzymatic Prep Profile thermocycler.close_lid() thermocycler.set_lid_temperature(70) - thermocycler.set_block_temperature(32, hold_time_minutes=1) - thermocycler.set_block_temperature(64.5, hold_time_minutes=1) + # Changed from hold_time_minutes to hold_time_seconds for faster running in CI + thermocycler.set_block_temperature(32, hold_time_seconds=1) + thermocycler.set_block_temperature(64.5, hold_time_seconds=1) thermocycler.set_block_temperature(4) thermocycler.deactivate_lid() thermocycler.open_lid() From e18e9ed748d0612fe810efd1554e94b2d3f4536d Mon Sep 17 00:00:00 2001 From: amit lissack Date: Tue, 9 Nov 2021 14:27:07 -0500 Subject: [PATCH 3/3] use dev folder in s3 --- g-code-testing/g_code_test_data/http/http_settings.py | 2 +- .../g_code_test_data/protocol/protocol_configurations.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/g-code-testing/g_code_test_data/http/http_settings.py b/g-code-testing/g_code_test_data/http/http_settings.py index 70ccec3ab12..ea94dad2990 100644 --- a/g-code-testing/g_code_test_data/http/http_settings.py +++ b/g-code-testing/g_code_test_data/http/http_settings.py @@ -12,5 +12,5 @@ ) -S3_BASE: Final = "http" +S3_BASE: Final = "dev/http" """Base of files in s3""" diff --git a/g-code-testing/g_code_test_data/protocol/protocol_configurations.py b/g-code-testing/g_code_test_data/protocol/protocol_configurations.py index bc2db9828a9..376d1be6fed 100644 --- a/g-code-testing/g_code_test_data/protocol/protocol_configurations.py +++ b/g-code-testing/g_code_test_data/protocol/protocol_configurations.py @@ -24,7 +24,7 @@ SWIFT_SMOOTHIE_SETTINGS.tempdeck.temperature.degrees_per_tick = 50 -S3_BASE: Final = "protocol" +S3_BASE: Final = "dev/protocol" """Base path of files in s3.""" ##################