python: Format and sort imports

pdgendt · kartben · commit bf2db7afc031 · 2024-11-25T10:07:13.000+01:00
ruff check --select I001 --fix applied to all python files that had
this as only issue.

Signed-off-by: Pieter De Gendt &lt;pieter.degendt@basalte.be&gt;
diff --git a/.ruff-excludes.toml b/.ruff-excludes.toml
diff --git a/samples/modules/thrift/hello/client/hello_client.py b/samples/modules/thrift/hello/client/hello_client.py
@@ -14,12 +14,12 @@
 
 import argparse
 import sys
+
 sys.path.append('gen-py')
 
-from thrift.protocol import TBinaryProtocol
-from thrift.transport import TTransport
-from thrift.transport import TSocket
 from hello import Hello
+from thrift.protocol import TBinaryProtocol
+from thrift.transport import TSocket, TTransport
 
 
 def parse_args():
diff --git a/samples/net/cellular_modem/server/te.py b/samples/net/cellular_modem/server/te.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import signal
+
 from te_udp_echo import TEUDPEcho
 from te_udp_receive import TEUDPReceive
 
diff --git a/samples/net/cloud/aws_iot_mqtt/src/creds/convert_keys.py b/samples/net/cloud/aws_iot_mqtt/src/creds/convert_keys.py
@@ -1,8 +1,9 @@
 # Copyright (c) 2023 Lucas Dietrich <ld.adecy@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-import os
 import glob
+import os
+
 
 def bin2array(name, fin, fout):
     with open(fin, 'rb') as f:
diff --git a/samples/subsys/profiling/perf/pytest/test_perf.py b/samples/subsys/profiling/perf/pytest/test_perf.py
@@ -7,8 +7,7 @@
 import logging
 import re
 
-from twister_harness import Shell
-from twister_harness import DeviceAdapter
+from twister_harness import DeviceAdapter, Shell
 
 logger = logging.getLogger(__name__)
 
diff --git a/samples/subsys/testsuite/pytest/basic/pytest/conftest.py b/samples/subsys/testsuite/pytest/basic/pytest/conftest.py
@@ -4,6 +4,7 @@
 
 import pytest
 
+
 # add option "--cmdopt" to pytest, or it will report "unknown option"
 # this option is passed from twister.
 def pytest_addoption(parser):
diff --git a/samples/subsys/zbus/remote_mock/remote_mock.py b/samples/subsys/zbus/remote_mock/remote_mock.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 # Copyright (c) 2022 Rodrigo Peixoto <rodrigopex@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
-import serial
+import argparse
 import json
 from time import sleep
-import argparse
+
+import serial
 
 j = """
 [
diff --git a/samples/subsys/zbus/uart_bridge/decoder.py b/samples/subsys/zbus/uart_bridge/decoder.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 # Copyright (c) 2022 Rodrigo Peixoto <rodrigopex@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
-import serial
-import json
 import argparse
+import json
+
+import serial
 
 j = """
 [
diff --git a/scripts/check_maintainers.py b/scripts/check_maintainers.py
@@ -7,9 +7,10 @@
 import argparse
 import sys
 
-from github_helpers import get_github_object
 from get_maintainer import Maintainers
 from github.GithubException import UnknownObjectException
+from github_helpers import get_github_object
+
 
 def parse_args():
     parser = argparse.ArgumentParser(
diff --git a/scripts/coredump/gdbstubs/__init__.py b/scripts/coredump/gdbstubs/__init__.py
@@ -4,12 +4,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from gdbstubs.arch.x86 import GdbStub_x86
-from gdbstubs.arch.x86_64 import GdbStub_x86_64
+from gdbstubs.arch.arm64 import GdbStub_ARM64
 from gdbstubs.arch.arm_cortex_m import GdbStub_ARM_CortexM
 from gdbstubs.arch.risc_v import GdbStub_RISC_V
+from gdbstubs.arch.x86 import GdbStub_x86
+from gdbstubs.arch.x86_64 import GdbStub_x86_64
 from gdbstubs.arch.xtensa import GdbStub_Xtensa
-from gdbstubs.arch.arm64 import GdbStub_ARM64
 
 
 class TgtCode:
diff --git a/scripts/generate_usb_vif/constants/xml_constants.py b/scripts/generate_usb_vif/constants/xml_constants.py
@@ -5,8 +5,7 @@
 
 """This file contains XML constants defined to be used by generate_vif.py"""
 
-from constants import other_constants
-from constants import vif_element_constants
+from constants import other_constants, vif_element_constants
 
 XML_ENCODING = "utf-8"
 XML_ELEMENT_NAME_PREFIX = "vif"
diff --git a/scripts/kconfig/kconfig.py b/scripts/kconfig/kconfig.py
@@ -23,8 +23,17 @@
 
 # Zephyr doesn't use tristate symbols. They're supported here just to make the
 # script a bit more generic.
-from kconfiglib import Kconfig, split_expr, expr_value, expr_str, BOOL, \
-                       TRISTATE, TRI_TO_STR, AND, OR
+from kconfiglib import (
+    AND,
+    BOOL,
+    OR,
+    TRI_TO_STR,
+    TRISTATE,
+    Kconfig,
+    expr_str,
+    expr_value,
+    split_expr,
+)
 
 
 def main():
diff --git a/scripts/logging/dictionary/log_parser_uart.py b/scripts/logging/dictionary/log_parser_uart.py
@@ -12,13 +12,13 @@
 the log messages.
 """
 
-import serial
-import time
 import argparse
 import logging
 import sys
+import time
 
 import parserlib
+import serial
 
 LOGGER_FORMAT = "%(message)s"
 logger = logging.getLogger("parser")
diff --git a/scripts/logging/dictionary/parserlib.py b/scripts/logging/dictionary/parserlib.py
@@ -12,8 +12,8 @@
 input binary data to the log using log database.
 """
 
-import sys
 import logging
+import sys
 
 import dictionary_parser
 from dictionary_parser.log_database import LogDatabase
diff --git a/scripts/pylib/pytest-twister-harness/src/twister_harness/helpers/mcumgr.py b/scripts/pylib/pytest-twister-harness/src/twister_harness/helpers/mcumgr.py
@@ -6,10 +6,9 @@
 import logging
 import re
 import shlex
-
-from subprocess import check_output, getstatusoutput
-from pathlib import Path
 from dataclasses import dataclass
+from pathlib import Path
+from subprocess import check_output, getstatusoutput
 
 logger = logging.getLogger(__name__)
 
diff --git a/scripts/pylib/pytest-twister-harness/tests/fixtures/mcumgr_fixture_test.py b/scripts/pylib/pytest-twister-harness/tests/fixtures/mcumgr_fixture_test.py
@@ -2,10 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import pytest
 import textwrap
-
 from unittest import mock
+
+import pytest
 from twister_harness.helpers.mcumgr import MCUmgr, MCUmgrException
 
 
diff --git a/scripts/pylib/pytest-twister-harness/tests/helpers/shell_mcuboot_command_parser_test.py b/scripts/pylib/pytest-twister-harness/tests/helpers/shell_mcuboot_command_parser_test.py
@@ -4,7 +4,7 @@
 
 import textwrap
 
-from twister_harness.helpers.shell import ShellMCUbootCommandParsed, ShellMCUbootArea
+from twister_harness.helpers.shell import ShellMCUbootArea, ShellMCUbootCommandParsed
 
 
 def test_if_mcuboot_command_output_is_parsed_two_areas() -> None:
diff --git a/scripts/tests/twister/test_mixins.py b/scripts/tests/twister/test_mixins.py
@@ -7,6 +7,7 @@
 """
 
 import os
+
 import pytest
 
 
diff --git a/scripts/tests/twister_blackbox/test_data/tests/pytest/pytest/conftest.py b/scripts/tests/twister_blackbox/test_data/tests/pytest/pytest/conftest.py
@@ -4,6 +4,7 @@
 
 import pytest
 
+
 # add option "--cmdopt" to pytest, or it will report "unknown option"
 # this option is passed from twister.
 def pytest_addoption(parser):
diff --git a/scripts/utils/migrate_includes.py b/scripts/utils/migrate_includes.py
@@ -16,10 +16,9 @@
 """
 
 import argparse
-from pathlib import Path
 import re
 import sys
-
+from pathlib import Path
 
 ZEPHYR_BASE = Path(__file__).parents[2]
 
diff --git a/scripts/utils/migrate_posix_kconfigs.py b/scripts/utils/migrate_posix_kconfigs.py
@@ -18,10 +18,9 @@
 """
 
 import argparse
-from pathlib import Path
 import re
 import sys
-
+from pathlib import Path
 
 ZEPHYR_BASE = Path(__file__).parents[2]
 
diff --git a/scripts/utils/migrate_sys_init.py b/scripts/utils/migrate_sys_init.py
@@ -15,8 +15,8 @@
 """
 
 import argparse
-from pathlib import Path
 import re
+from pathlib import Path
 
 
 def update_sys_init(project, dry_run):
diff --git a/scripts/utils/twister_to_list.py b/scripts/utils/twister_to_list.py
@@ -16,7 +16,6 @@
 
 from ruamel.yaml import YAML
 
-
 FIELDS = (
     "arch_exclude",
     "arch_allow",
diff --git a/scripts/west_commands/boards.py b/scripts/west_commands/boards.py
@@ -4,19 +4,19 @@
 
 import argparse
 import os
-from pathlib import Path
 import re
 import sys
 import textwrap
+from pathlib import Path
 
 from west.commands import WestCommand
-
 from zephyr_ext_common import ZEPHYR_BASE
 
 sys.path.append(os.fspath(Path(__file__).parent.parent))
 import list_boards
 import zephyr_module
 
+
 class Boards(WestCommand):
 
     def __init__(self):
diff --git a/scripts/west_commands/shields.py b/scripts/west_commands/shields.py
@@ -5,19 +5,19 @@
 
 import argparse
 import os
-from pathlib import Path
 import re
 import sys
 import textwrap
+from pathlib import Path
 
 from west.commands import WestCommand
-
 from zephyr_ext_common import ZEPHYR_BASE
 
 sys.path.append(os.fspath(Path(__file__).parent.parent))
 import list_shields
 import zephyr_module
 
+
 class Shields(WestCommand):
 
     def __init__(self):
diff --git a/scripts/west_commands/tests/test_imports.py b/scripts/west_commands/tests/test_imports.py
@@ -4,6 +4,7 @@
 
 from runners.core import ZephyrBinaryRunner
 
+
 def test_runner_imports():
     # Ensure that all runner modules are imported and returned by
     # get_runners().
diff --git a/scripts/west_commands/tests/test_twister.py b/scripts/west_commands/tests/test_twister.py
@@ -2,11 +2,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+import argparse
 from argparse import Namespace
 
-from twister_cmd import Twister
 import pytest
-import argparse
+from twister_cmd import Twister
 
 TEST_CASES = [
     {
diff --git a/soc/intel/intel_adsp/tools/acetool.py b/soc/intel/intel_adsp/tools/acetool.py
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import asyncio
+
 import cavstool
 
 if __name__ == "__main__":
diff --git a/tests/boot/with_mcumgr/pytest/test_downgrade_prevention.py b/tests/boot/with_mcumgr/pytest/test_downgrade_prevention.py
@@ -4,17 +4,12 @@
 from __future__ import annotations
 
 import logging
-
 from pathlib import Path
-from twister_harness import DeviceAdapter, Shell, MCUmgr
-from twister_harness.helpers.utils import (
-    find_in_config,
-    match_lines,
-    match_no_lines
-)
-from utils import check_with_shell_command, check_with_mcumgr_command
-from test_upgrade import create_signed_image
 
+from test_upgrade import create_signed_image
+from twister_harness import DeviceAdapter, MCUmgr, Shell
+from twister_harness.helpers.utils import find_in_config, match_lines, match_no_lines
+from utils import check_with_mcumgr_command, check_with_shell_command
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/boot/with_mcumgr/pytest/test_upgrade.py b/tests/boot/with_mcumgr/pytest/test_upgrade.py
@@ -3,17 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 from __future__ import annotations
 
-import pytest
 import logging
-
 from pathlib import Path
-from twister_harness import DeviceAdapter, Shell, MCUmgr
-from twister_harness.helpers.utils import (
-    find_in_config,
-    match_lines,
-    match_no_lines
-)
-from utils import check_with_shell_command, check_with_mcumgr_command
+
+import pytest
+from twister_harness import DeviceAdapter, MCUmgr, Shell
+from twister_harness.helpers.utils import find_in_config, match_lines, match_no_lines
+from utils import check_with_mcumgr_command, check_with_shell_command
 from west_sign_wrapper import west_sign_with_imgtool
 
 logger = logging.getLogger(__name__)
diff --git a/tests/boot/with_mcumgr/pytest/utils.py b/tests/boot/with_mcumgr/pytest/utils.py
@@ -5,10 +5,9 @@
 
 import logging
 
-from twister_harness import Shell, MCUmgr
+from twister_harness import MCUmgr, Shell
 from twister_harness.helpers.shell import ShellMCUbootCommandParsed
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/drivers/can/host/pytest/conftest.py b/tests/drivers/can/host/pytest/conftest.py
diff --git a/tests/kernel/timer/timer_behavior/pytest/conftest.py b/tests/kernel/timer/timer_behavior/pytest/conftest.py
diff --git a/tests/misc/llext-edk/pytest/test_edk.py b/tests/misc/llext-edk/pytest/test_edk.py
diff --git a/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py b/tests/net/lib/lwm2m/interop/pytest/test_blockwise.py
diff --git a/tests/net/socket/udp/generate-c-string.py b/tests/net/socket/udp/generate-c-string.py
diff --git a/tests/subsys/logging/dictionary/pytest/test_logging_dictionary.py b/tests/subsys/logging/dictionary/pytest/test_logging_dictionary.py
