fix I001 unsorted-imports

Signed-off-by: Gaëtan Lehmann <[email protected]>

Author: glehmann

conftest.py

@@ -1,19 +1,25 @@
 import itertools
-import git
 import logging
 import os
-import pytest
 import tempfile
+from typing import Dict
 
+import git
+import pytest
 from packaging import version
-from typing import Dict
 
 import lib.config as global_config
-
 from lib import pxe
-from lib.common import callable_marker, shortened_nodeid, prefix_object_name
-from lib.common import wait_for, vm_image, is_uuid
-from lib.common import setup_formatted_and_mounted_disk, teardown_formatted_and_mounted_disk
+from lib.common import (
+    callable_marker,
+    is_uuid,
+    prefix_object_name,
+    setup_formatted_and_mounted_disk,
+    shortened_nodeid,
+    teardown_formatted_and_mounted_disk,
+    vm_image,
+    wait_for,
+)
 from lib.netutil import is_ipv6
 from lib.pool import Pool
 from lib.sr import SR

jobs.py

@@ -4,6 +4,7 @@
 import json
 import subprocess
 import sys
+
 from lib.commands import ssh
 
 JOBS = {

lib/basevm.py

@@ -1,8 +1,8 @@
 import logging
-
-from typing import Any, Literal, Optional, overload, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Literal, Optional, overload
 
 import lib.commands as commands
+
 if TYPE_CHECKING:
     import lib.host
 

lib/commands.py

@@ -2,13 +2,11 @@
 import logging
 import shlex
 import subprocess
-from typing import List, Literal, overload, Union
-
+from typing import List, Literal, Union, overload
 
 import lib.config as config
 from lib.netutil import wrap_ip
 
-
 class BaseCommandFailed(Exception):
     __slots__ = 'returncode', 'stdout', 'cmd'
 

lib/common.py

@@ -7,13 +7,14 @@
 import time
 import traceback
 from enum import Enum
-from typing import Callable, cast, Dict, Literal, Optional, overload, TYPE_CHECKING, TypeVar, Union
+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
+
 if TYPE_CHECKING:
     import lib.host
 
@@ -26,7 +27,7 @@ class PackageManagerEnum(Enum):
 
 # Common VM images used in tests
 def vm_image(vm_key):
-    from data import VM_IMAGES, DEF_VM_URL
+    from data import DEF_VM_URL, VM_IMAGES
     url = VM_IMAGES[vm_key]
     if not url.startswith('http'):
         url = DEF_VM_URL + url

lib/config.py

@@ -2,7 +2,7 @@
 ssh_output_max_lines = 20
 
 def sr_device_config(datakey, *, required=[]):
-    import data # import here to avoid depending on this user file for collecting tests
+    import data  # import here to avoid depending on this user file for collecting tests
     config = getattr(data, datakey)
     for required_field in required:
         if required_field not in config:

lib/efi.py

@@ -19,7 +19,6 @@
 
 import lib.commands as commands
 
-
 class GUID(UUID):
     def as_bytes(self):
         return self.bytes_le

lib/host.py

@@ -6,18 +6,30 @@
 import subprocess
 import tempfile
 import uuid
+from typing import TYPE_CHECKING, Dict, List, Literal, Optional, Union, overload
 
 from packaging import version
-from typing import Dict, List, Literal, Optional, overload, TYPE_CHECKING, Union
 
 import lib.commands as commands
 import lib.pif as pif
+
 if TYPE_CHECKING:
     import lib.pool
 
-from lib.common import _param_add, _param_clear, _param_get, _param_remove, _param_set, strtobool
-from lib.common import safe_split, strip_suffix, to_xapi_bool, wait_for, wait_for_not
-from lib.common import prefix_object_name
+from lib.common import (
+    _param_add,
+    _param_clear,
+    _param_get,
+    _param_remove,
+    _param_set,
+    prefix_object_name,
+    safe_split,
+    strip_suffix,
+    strtobool,
+    to_xapi_bool,
+    wait_for,
+    wait_for_not,
+)
 from lib.netutil import wrap_ip
 from lib.sr import SR
 from lib.vdi import VDI
@@ -29,7 +41,7 @@
 
 def host_data(hostname_or_ip):
     # read from data.py
-    from data import HOST_DEFAULT_USER, HOST_DEFAULT_PASSWORD, HOSTS
+    from data import HOST_DEFAULT_PASSWORD, HOST_DEFAULT_USER, HOSTS
     if hostname_or_ip in HOSTS:
         h_data = HOSTS[hostname_or_ip]
         return h_data

lib/installer.py

@@ -2,7 +2,7 @@
 import time
 import xml.etree.ElementTree as ET
 
-from lib.commands import ssh, SSHCommandFailed
+from lib.commands import SSHCommandFailed, ssh
 from lib.common import wait_for
 
 class AnswerFile:

lib/pif.py

@@ -1,5 +1,4 @@
 import lib.commands as commands
-
 from lib.common import _param_add, _param_clear, _param_get, _param_remove, _param_set
 
 class PIF: