reverse order of class init args: unit is higher priority

Pioreactor · Sep 6, 2023 · f160bd9 · f160bd9
1 parent cbe868b
commit f160bd9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/pioreactor/actions/self_test.py b/pioreactor/actions/self_test.py
@@ -315,7 +315,7 @@ def test_positive_correlation_between_temperature_and_heating(
 ) -> None:
     assert is_heating_pcb_present()
 
-    with TemperatureController("only_record_temperature", unit=unit, experiment=experiment) as tc:
+    with TemperatureController(unit, experiment, "only_record_temperature") as tc:
         measured_pcb_temps = []
         dcs = list(range(0, 22, 3))
         logger.debug("Varying heating.")

diff --git a/pioreactor/background_jobs/dosing_control.py b/pioreactor/background_jobs/dosing_control.py
@@ -59,7 +59,7 @@ class DosingController(BackgroundJob):
         "automation_name": {"datatype": "string", "settable": False},
     }
 
-    def __init__(self, automation_name: str, unit: str, experiment: str, **kwargs) -> None:
+    def __init__(self, unit: str, experiment: str, automation_name: str, **kwargs) -> None:
         super().__init__(unit=unit, experiment=experiment)
 
         try:
@@ -149,9 +149,9 @@ def start_dosing_control(
     **kwargs,
 ) -> DosingController:
     return DosingController(
-        automation_name,
         unit=unit or whoami.get_unit_name(),
         experiment=experiment or whoami.get_latest_experiment_name(),
+        automation_name=automation_name,
         duration=duration,
         skip_first_run=skip_first_run,
         **kwargs,

diff --git a/pioreactor/background_jobs/led_control.py b/pioreactor/background_jobs/led_control.py
@@ -32,7 +32,7 @@ class LEDController(BackgroundJob):
         "automation_name": {"datatype": "string", "settable": False},
     }
 
-    def __init__(self, automation_name: str, unit: str, experiment: str, **kwargs) -> None:
+    def __init__(self, unit: str, experiment: str, automation_name: str, **kwargs) -> None:
         super(LEDController, self).__init__(unit=unit, experiment=experiment)
 
         if not hardware.is_HAT_present():
@@ -114,9 +114,9 @@ def start_led_control(
     **kwargs,
 ) -> LEDController:
     return LEDController(
-        automation_name=automation_name,
         unit=unit or get_unit_name(),
         experiment=experiment or get_latest_experiment_name(),
+        automation_name=automation_name,
         skip_first_run=skip_first_run,
         duration=duration,
         **kwargs,

diff --git a/pioreactor/background_jobs/temperature_control.py b/pioreactor/background_jobs/temperature_control.py
@@ -92,9 +92,9 @@ class TemperatureController(BackgroundJob):
 
     def __init__(
         self,
-        automation_name: str,
         unit: str,
         experiment: str,
+        automation_name: str,
         **kwargs,
     ) -> None:
         super().__init__(unit=unit, experiment=experiment)
@@ -564,9 +564,9 @@ def start_temperature_control(
     **kwargs,
 ) -> TemperatureController:
     return TemperatureController(
-        automation_name=automation_name,
         unit=unit or whoami.get_unit_name(),
         experiment=experiment or whoami.get_latest_experiment_name(),
+        automation_name=automation_name,
         **kwargs,
     )