Use two new sections for ruff: typing and testing

- Everything related to the `typing` module is grouped
  in the second import section. Typing is just there
  for verification purposes, it's not a logic module
  like a local or system module that is used
  in functions or algorithms.
- And all `pytest` imports are added in a third
  section just after `typing`.
- `future` imports are in the first section to avoid
  this error during checks:
  """
  SyntaxError: from __future__ imports must occur at the beginning of the file
  """

Signed-off-by: Ronan Abhamon <[email protected]>

Author: Wescoeur

conftest.py

@@ -1,11 +1,13 @@
+from typing import Dict
+
+import pytest
+
 import itertools
 import logging
 import os
 import tempfile
-from typing import Dict
 
 import git
-import pytest
 from packaging import version
 
 import lib.config as global_config

lib/basevm.py

@@ -1,6 +1,7 @@
-import logging
 from typing import TYPE_CHECKING, Any, Literal, Optional, overload
 
+import logging
+
 if TYPE_CHECKING:
     import lib.host
 

lib/commands.py

@@ -1,8 +1,9 @@
+from typing import List, Literal, Union, overload
+
 import base64
 import logging
 import shlex
 import subprocess
-from typing import List, Literal, Union, overload
 
 import lib.config as config
 from lib.netutil import wrap_ip

lib/common.py

@@ -1,3 +1,7 @@
+from typing import TYPE_CHECKING, Callable, Dict, Literal, Optional, TypeVar, Union, cast, overload
+
+import pytest
+
 import getpass
 import inspect
 import itertools
@@ -7,10 +11,8 @@
 import time
 import traceback
 from enum import Enum
-from typing import TYPE_CHECKING, Callable, Dict, Literal, Optional, TypeVar, Union, cast, overload
 from uuid import UUID
 
-import pytest
 import requests
 
 import lib.commands as commands

lib/host.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING, Dict, List, Literal, Optional, Union, overload
+
 import logging
 import os
 import shlex
 import tempfile
 import uuid
-from typing import TYPE_CHECKING, Dict, List, Literal, Optional, Union, overload
 
 from packaging import version
 

lib/pool.py

@@ -1,7 +1,8 @@
+from typing import Any, Dict, Optional
+
 import logging
 import os
 import traceback
-from typing import Any, Dict, Optional
 
 from packaging import version
 

lib/typing.py

@@ -1,6 +1,7 @@
-import sys
 from typing import TypedDict
 
+import sys
+
 if sys.version_info >= (3, 11):
     from typing import NotRequired
 else:

lib/vdi.py

@@ -1,6 +1,7 @@
-import logging
 from typing import TYPE_CHECKING, Literal, Optional, overload
 
+import logging
+
 from lib.common import _param_add, _param_clear, _param_get, _param_remove, _param_set, strtobool
 
 if TYPE_CHECKING:

lib/vm.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING, List, Literal, Optional, Union, overload
+
 import logging
 import os
 import tempfile
-from typing import TYPE_CHECKING, List, Literal, Optional, Union, overload
 
 import lib.commands as commands
 import lib.efi as efi

lib/xo.py

@@ -1,6 +1,7 @@
+from typing import Any, Dict, Literal, Union, overload
+
 import json
 import subprocess
-from typing import Any, Dict, Literal, Union, overload
 
 @overload
 def xo_cli(action: str, args: Dict[str, str] = {}, *, check: bool = True, simple_output: Literal[True] = True,