Skip to content

Commit 8e55ce9

Browse files
committed
removing google sheets tools
1 parent 6561b8f commit 8e55ce9

File tree

4 files changed

+13
-151
lines changed

4 files changed

+13
-151
lines changed

hardware-testing/hardware_testing/abr.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

hardware-testing/hardware_testing/google_sheets_tool.py

Lines changed: 0 additions & 116 deletions
This file was deleted.

hardware-testing/hardware_testing/scripts/abr_asair_sensor.py

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
import os
1010

1111

12-
13-
14-
1512
def _get_user_input(lst: List[str], some_string: str) -> str:
1613
variable = input(some_string)
1714
while variable not in lst:
@@ -24,27 +21,20 @@ def _get_user_input(lst: List[str], some_string: str) -> str:
2421

2522
class _ABRAsairSensor:
2623
def __init__(self, robot: str, duration: int, frequency: int) -> None:
27-
var = _get_user_input(["C", "R"], "Running on computer (C) or robot (R)? ")
28-
if var == "R":
29-
try:
30-
sys.path.insert(0, "/var/lib/jupyter/notebooks")
31-
import google_sheets_tool # type: ignore[import]
32-
credentials_path = "/var/lib/jupyter/notebooks/abr.json"
33-
except ImportError:
34-
from hardware_testing import google_sheets_tool
35-
raise ImportError(
36-
"Run on robot. Make sure google_sheets_tool.py is in jupyter notebook."
37-
)
38-
else:
39-
from hardware_testing import google_sheets_tool
40-
#credentials_path = "/hardware-testing/hardware_testing/abr.json"
41-
credentials_path = "C:/Users/Rhyann Clarke/opentrons/hardware-testing/hardware_testing/abr.json"
42-
24+
try:
25+
sys.path.insert(0, "/var/lib/jupyter/notebooks")
26+
import google_sheets_tool # type: ignore[import]
27+
28+
credentials_path = "/var/lib/jupyter/notebooks/abr.json"
29+
except ImportError:
30+
raise ImportError(
31+
"Run on robot. Make sure google_sheets_tool.py is in jupyter notebook."
32+
)
4333
print(os.path.exists(credentials_path))
4434
test_name = "ABR-Environment-Monitoring"
4535
run_id = data.create_run_id()
4636
file_name = data.create_file_name(test_name, run_id, robot)
47-
sensor = asair_sensor.BuildAsairSensor(False, False)
37+
sensor = asair_sensor.BuildAsairSensor(False, True)
4838
print(sensor)
4939
env_data = sensor.get_reading()
5040
header = [
@@ -58,7 +48,6 @@ def __init__(self, robot: str, duration: int, frequency: int) -> None:
5848
header_str = ",".join(header) + "\n"
5949
data.append_data_to_file(test_name, run_id, file_name, header_str)
6050
# Upload to google has passed
61-
6251
try:
6352
google_sheet = google_sheets_tool.google_sheet(
6453
credentials_path, "ABR Ambient Conditions", tab_number=0
@@ -132,7 +121,7 @@ def __init__(self, robot: str, duration: int, frequency: int) -> None:
132121
"PVT1ABR10",
133122
"PVT1ABR11",
134123
"PVT1ABR12",
135-
"ROOM_339",
124+
"ROOM_339",
136125
"Room_340",
137126
] # type: List
138127
robot = _get_user_input(robot_list, "Robot/Room: ")

hardware-testing/hardware_testing/scripts/abr_scale.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
"PVT1ABR10",
2525
"PVT1ABR11",
2626
"PVT1ABR12",
27+
"ROOM_339",
28+
"ROOM_340",
2729
]
2830
# Labware per Robot
2931
labware_DVT1ABR4 = [

0 commit comments

Comments
 (0)