Ruff/pyright

utils/build_architectures.py

@@ -14,7 +14,7 @@ class BuildArchitectures(Enum):
     _32BIT = 2
 
     @staticmethod
-    def archname(arch):
+    def archname(arch: str) -> str:
         """
         Returns: nice name of architecture
         """

utils/calibration_utils.py

@@ -1,10 +1,14 @@
 import time
+import typing
 from contextlib import contextmanager
 
 CAL_SEL_PV = "CAL:SEL"
 
+if typing.TYPE_CHECKING:
+    from utils.channel_access import ChannelAccess
 
-def set_calibration_file(channel_access, filename, prefix=""):
+
+def set_calibration_file(channel_access: "ChannelAccess", filename: str, prefix: str = "") -> None:
     """
     Sets a calibration file. Retries if it didn't set properly first time.
     Args:
@@ -29,12 +33,16 @@ def set_calibration_file(channel_access, filename, prefix=""):
         )
 
 
-def reset_calibration_file(channel_access, default_file="None.txt", prefix=""):
+def reset_calibration_file(
+    channel_access: "ChannelAccess", default_file: str = "None.txt", prefix: str = ""
+) -> None:
     set_calibration_file(channel_access, default_file, prefix)
 
 
 @contextmanager
-def use_calibration_file(channel_access, filename, default_file="None.txt", prefix=""):
+def use_calibration_file(
+    channel_access: "ChannelAccess", filename: str, default_file: str = "None.txt", prefix: str = ""
+) -> typing.Generator[None, None, None]:
     set_calibration_file(channel_access, filename, prefix)
     try:
         yield

utils/device_launcher.py

@@ -1,13 +1,9 @@
-from contextlib import contextmanager
-
-try:
-    from contextlib import ExitStack  # PY3
-except ImportError:
-    from contextlib2 import ExitStack  # PY2
+from contextlib import ExitStack, contextmanager
+from typing import ContextManager, Generator
 
 
 @contextmanager
-def device_launcher(ioc, lewis):
+def device_launcher(ioc: ContextManager, lewis: ContextManager) -> Generator[None, None, None]:
     """
     Context manager that launches an ioc and emulator pair
     :param ioc: the ioc launcher
@@ -22,10 +18,11 @@ def device_launcher(ioc, lewis):
 
 
 @contextmanager
-def device_collection_launcher(devices):
+def device_collection_launcher(devices: list[ContextManager]) -> Generator[None, None, None]:
     """
     Context manager that launches a list of devices
-    :param devices: list of context managers representing the devices to launch (see device_launcher above)
+    :param devices: list of context managers representing the devices to launch
+        (see device_launcher above)
     """
     with ExitStack() as stack:
         for device in devices:

utils/emulator_exceptions.py

@@ -1,9 +1,9 @@
-class UnableToConnectToEmulatorException(IOError):
+class UnableToConnectToEmulatorException(IOError):  # noqa: N818 (historic name)
     """
     The system is unable to connect to the emulator for some reason.
     """
 
-    def __init__(self, emulator_name, err):
+    def __init__(self, emulator_name: str, err: str | BaseException) -> None:
         super(UnableToConnectToEmulatorException, self).__init__(
             "Unable to connect to Emnulator {0}: {1}".format(emulator_name, err)
         )