switch over to using abt_testing for google sheets tools

Opentrons · May 31, 2024 · d4d36fc · d4d36fc
1 parent 0666f02
commit d4d36fc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 284 deletions.
diff --git a/hardware-testing/Pipfile b/hardware-testing/Pipfile
@@ -8,6 +8,7 @@ opentrons = {editable = true, path = "./../api", extras=['flex-hardware']}
 opentrons-shared-data = {editable = true, path = "./../shared-data/python"}
 opentrons-hardware = {editable = true, path = "./../hardware", extras=['FLEX']}
 hardware-testing = { editable = true, path = "." }
+abr-testing = { editable = true, path = "./../abr-testing" }
 pyserial = "==3.5"
 
 [dev-packages]

diff --git a/hardware-testing/Pipfile.lock b/hardware-testing/Pipfile.lock
diff --git a/hardware-testing/hardware_testing/liquid_sense/__main__.py b/hardware-testing/hardware_testing/liquid_sense/__main__.py
@@ -39,7 +39,7 @@
     liquid_sense_ot3_p1000_single_vial,
 )
 
-from . import google_sheets_tool
+from abr_testing.automation import google_sheets_tool
 
 
 CREDENTIALS_PATH = "/var/lib/jupyter/notebooks/abr.json"

diff --git a/hardware-testing/hardware_testing/liquid_sense/execute.py b/hardware-testing/hardware_testing/liquid_sense/execute.py
@@ -28,7 +28,7 @@
 
 from opentrons_shared_data.errors.exceptions import LiquidNotFoundError
 
-from . import google_sheets_tool
+from abr_testing.automation import google_sheets_tool
 
 
 PROBE_MAX_TIME: Dict[int, float] = {

diff --git a/hardware-testing/hardware_testing/liquid_sense/google_sheets_tool.py b/hardware-testing/hardware_testing/liquid_sense/google_sheets_tool.py
diff --git a/hardware-testing/hardware_testing/liquid_sense/post_process.py b/hardware-testing/hardware_testing/liquid_sense/post_process.py
@@ -168,7 +168,7 @@ def process_csv_directory(  # noqa: C901
                         [x] for x in pressure_header_row
                     ]
                     google_sheet.batch_update_cells(
-                        sheet_name, pressure_header_for_google_sheet, "H", 10, sheet_id
+                        pressure_header_for_google_sheet, "H", 10, sheet_id
                     )
                 except gspread.exceptions.APIError:
                     ui.print_error("Header did not write on google sheet.")

diff --git a/hardware-testing/hardware_testing/liquid_sense/report.py b/hardware-testing/hardware_testing/liquid_sense/report.py
@@ -4,7 +4,7 @@
 import statistics
 from typing import List, Union, Optional
 
-from . import google_sheets_tool
+from abr_testing.automation import google_sheets_tool
 
 from hardware_testing.data import ui
 
@@ -238,7 +238,7 @@ def store_trial(
                 ["Adjusted Height"],
                 ["Normalized Height"],
             ]
-            google_sheet.batch_update_cells(sheet_name, gs_header, "A", 10, sheet_id)
+            google_sheet.batch_update_cells(gs_header, "A", 10, sheet_id)
         try:
             trial_for_google_sheet: List[List[str]] = [
                 [f"{trial + 1}"],
@@ -248,7 +248,7 @@ def store_trial(
                 [f"{height + tip_length_offset}"],
             ]
             google_sheet.batch_update_cells(
-                sheet_name, trial_for_google_sheet, "A", 11 + int(trial), sheet_id
+                trial_for_google_sheet, "A", 11 + int(trial), sheet_id
             )
         except gspread.exceptions.APIError:
             ui.print_error(f"did not log trial {trial+1} to google sheet.")