Apply suggestions from code review

Co-authored-by: Michael Osthege <m.osthege@fz-juelich.de>
JuBiotech · Jan 24, 2023 · 656b7b1 · 656b7b1
1 parent bca93a1
commit 656b7b1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 40 deletions.
diff --git a/robotools/evotools/__init__.py b/robotools/evotools/__init__.py
@@ -291,10 +291,7 @@ def _prepare_evo_aspirate_dispense_parameters(
             tip = _int_to_tip(tip)
         tecan_tips.append(tip)
 
-    if tecan_tips:
-        return labware, wells, labware_position, volume, liquid_class, tecan_tips
-    else:
-        return labware, wells, labware_position, volume, liquid_class, tips
+    return labware, wells, labware_position, volume, liquid_class, tecan_tips
 
 
 def _prepare_evo_wash_parameters(
@@ -459,38 +456,21 @@ def _prepare_evo_wash_parameters(
     if not low_volume == 0 and not low_volume == 1:
         raise ValueError("Parameter low_volume has to be 0 (no fast-wash) or 1 (use fast-wash).")
 
-    if tecan_tips:
-        return (
-            tecan_tips,
-            waste_location,
-            cleaner_location,
-            arm,
-            waste_vol,
-            waste_delay,
-            cleaner_vol,
-            cleaner_delay,
-            airgap,
-            airgap_speed,
-            retract_speed,
-            fastwash,
-            low_volume,
-        )
-    else:
-        return (
-            tips,
-            waste_location,
-            cleaner_location,
-            arm,
-            waste_vol,
-            waste_delay,
-            cleaner_vol,
-            cleaner_delay,
-            airgap,
-            airgap_speed,
-            retract_speed,
-            fastwash,
-            low_volume,
-        )
+    return (
+        tecan_tips,
+        waste_location,
+        cleaner_location,
+        arm,
+        waste_vol,
+        waste_delay,
+        cleaner_vol,
+        cleaner_delay,
+        airgap,
+        airgap_speed,
+        retract_speed,
+        fastwash,
+        low_volume,
+    )
 
 
 def _optimize_partition_by(

diff --git a/robotools/tests.py b/robotools/tests.py
@@ -960,7 +960,6 @@ def test_parameter_validation(self) -> None:
 
         return
 
-    # test complete evo_aspirate() command
     def test_evo_aspirate1(self) -> None:
         plate = liquidhandling.Labware("DWP", 8, 12, min_volume=0, max_volume=2000, initial_volumes=1000)
         with evotools.Worklist() as wl:
@@ -995,7 +994,6 @@ def test_evo_aspirate2(self) -> None:
             )
         return
 
-    # test complete evo_dispense() command
     def test_evo_dispense1(self) -> None:
         plate = liquidhandling.Labware("DWP", 8, 12, min_volume=0, max_volume=2000, initial_volumes=1000)
         with evotools.Worklist() as wl:
@@ -1013,7 +1011,6 @@ def test_evo_dispense1(self) -> None:
             )
         return
 
-    # test complete evo_dispense() command
     def test_evo_dispense2(self) -> None:
         plate = liquidhandling.Labware("DWP", 8, 12, min_volume=0, max_volume=2000, initial_volumes=1000)
         with evotools.Worklist() as wl:
@@ -1031,7 +1028,6 @@ def test_evo_dispense2(self) -> None:
             )
         return
 
-    # test complete evo_wash() command
     def test_evo_wash(self) -> None:
         with evotools.Worklist() as wl:
             wl.evo_wash(