refactor: enforce non-quoted type annotations

Enable ruff rules UP037 and FA to forbid quoted type annotations. Plain type
annotations are cleaner, more readable, and enable better IDE support and
type checking compared to string literals.

Signed-off-by: Gaëtan Lehmann <gaetan.lehmann@vates.tech>

Author: glehmann

lib/host.py

@@ -55,7 +55,7 @@ def host_data(hostname_or_ip: str) -> dict[str, str]:
 
 class Host:
     xe_prefix = "host"
-    pool: "Pool"
+    pool: Pool
 
     # Data extraction is automatic, no conversion from str is done.
     @dataclass

lib/vdi.py

@@ -13,15 +13,15 @@
     wait_for,
 )
 
-from typing import TYPE_CHECKING, Callable, Literal, TypeVar, overload
+from typing import TYPE_CHECKING, Callable, Literal, TypeAlias, TypeVar, overload
 
 if TYPE_CHECKING:
     from lib.host import Host
     from lib.sr import SR
 
 R = TypeVar("R")
 
-ImageFormat = Literal['qcow2', 'raw', 'vhd']
+ImageFormat: TypeAlias = Literal['qcow2', 'raw', 'vhd']
 
 class VDI:
     xe_prefix = "vdi"

lib/vm.py

@@ -706,7 +706,7 @@ def create_cd_vbd(self, device: str, userdevice: str) -> VBD:
         logging.info("New VBD %s", vbd_uuid)
         return vbd
 
-    def clone(self, *, name: str | None = None) -> "VM":
+    def clone(self, *, name: str | None = None) -> VM:
         if name is None:
             name = self.name() + '_clone_for_tests'
         logging.info("Clone VM")

pyproject.toml

@@ -56,12 +56,14 @@ quote-style = "preserve"
 select = [
   "ANN",  # flake8-annotations
   "D",  # pydocstyle
+  "FA",  # future-annotations
   "F",  # Pyflakes
   "I",  # isort
   "SLF",  # flake8-self
   "SIM",  # flake8-simplify
   "UP006",  # non-pep585-annotation
   "UP007",  # non-pep604-annotation-union
+  "UP037",  # quoted-annotation
   "UP045",  # non-pep604-annotation-optional
 ]
 # don't use some of the default D and SIM rules
@@ -91,6 +93,9 @@ ignore = [
 # restrict to the PEP 257 rules
 pydocstyle.convention = "pep257"
 
+# let ruff require future annotations where it can be useful
+future-annotations = true
+
 [tool.ruff.lint.extend-per-file-ignores]
 # Pytest fixtures are often flagged as unused imports (F401) or 
 # redefined variables (F811) because they are injected by name.

tests/storage/lvmohba/test_lvmohba_sr.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from lib.commands import SSHCommandFailed
@@ -55,7 +57,7 @@ def test_snapshot(self, vm_on_lvmohba_sr: VM) -> None:
     @pytest.mark.small_vm
     @pytest.mark.parametrize("vdi_op", ["snapshot", "clone"])
     def test_coalesce(
-        self, storage_test_vm: 'VM', vdi_on_lvmohba_sr: 'VDI', vdi_op: CoalesceOperation, defer: Defer
+        self, storage_test_vm: VM, vdi_on_lvmohba_sr: VDI, vdi_op: CoalesceOperation, defer: Defer
     ) -> None:
         coalesce_integrity(storage_test_vm, vdi_on_lvmohba_sr, vdi_op, defer)
 

tests/storage/lvmoiscsi/test_lvmoiscsi_sr.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from lib.commands import SSHCommandFailed
@@ -54,7 +56,7 @@ def test_snapshot(self, vm_on_lvmoiscsi_sr: VM) -> None:
 
     @pytest.mark.small_vm
     @pytest.mark.parametrize("vdi_op", ["snapshot", "clone"])
-    def test_coalesce(self, storage_test_vm: 'VM', vdi_on_lvmoiscsi_sr: 'VDI', vdi_op: CoalesceOperation,
+    def test_coalesce(self, storage_test_vm: VM, vdi_on_lvmoiscsi_sr: VDI, vdi_op: CoalesceOperation,
                       defer: Defer) -> None:
         coalesce_integrity(storage_test_vm, vdi_on_lvmoiscsi_sr, vdi_op, defer)