From aad2408b3038fe3fa0989f3a3d23c46a8d75cf6d Mon Sep 17 00:00:00 2001 From: Pieter De Gendt Date: Thu, 16 Oct 2025 10:58:08 +0200 Subject: [PATCH] scripts: Don't use isort known-first-party Partially revert 1bcc0652241af70d0b28aee155f260cd9ca0fc74 This change impacts all other scripts that import those modules, while those weren't updated. It will be hard to maintain this list, whilst keeping the entire tree compliant. Signed-off-by: Pieter De Gendt --- .ruff.toml | 14 -------------- scripts/tests/twister/conftest.py | 1 - .../pytest_integration/test_harness_pytest.py | 1 - scripts/tests/twister/test_cmakecache.py | 1 - scripts/tests/twister/test_config_parser.py | 1 - scripts/tests/twister/test_environment.py | 1 - scripts/tests/twister/test_errors.py | 1 - scripts/tests/twister/test_handlers.py | 3 +-- scripts/tests/twister/test_hardwaremap.py | 1 - scripts/tests/twister/test_harness.py | 1 - scripts/tests/twister/test_log_helper.py | 1 - scripts/tests/twister/test_platform.py | 1 - scripts/tests/twister/test_quarantine.py | 1 - scripts/tests/twister/test_runner.py | 1 - scripts/tests/twister/test_scl.py | 3 +-- scripts/tests/twister/test_testinstance.py | 1 - scripts/tests/twister/test_testplan.py | 1 - scripts/tests/twister/test_testsuite.py | 1 - scripts/tests/twister/test_twister.py | 1 - 19 files changed, 2 insertions(+), 34 deletions(-) diff --git a/.ruff.toml b/.ruff.toml index 47ac187c67c..c9be3b43104 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -25,20 +25,6 @@ ignore = [ # zephyr-keep-sorted-stop ] -[lint.isort] -known-first-party = [ - # zephyr-keep-sorted-start - "camera_shield", - "domains", - "list_boards", - "scl", - "twister", - "twister_harness", - "twisterlib", - "zephyr_module" , - # zephyr-keep-sorted-stop -] - [format] quote-style = "preserve" line-ending = "lf" diff --git a/scripts/tests/twister/conftest.py b/scripts/tests/twister/conftest.py index e8291c89cff..f1042f54b1a 100644 --- a/scripts/tests/twister/conftest.py +++ b/scripts/tests/twister/conftest.py @@ -8,7 +8,6 @@ import logging import os import pytest - from twisterlib.environment import TwisterEnv, add_parse_arguments, parse_arguments from twisterlib.testinstance import TestInstance from twisterlib.testplan import TestConfiguration, TestPlan diff --git a/scripts/tests/twister/pytest_integration/test_harness_pytest.py b/scripts/tests/twister/pytest_integration/test_harness_pytest.py index 6b12ff996bd..337b08f5e4e 100644 --- a/scripts/tests/twister/pytest_integration/test_harness_pytest.py +++ b/scripts/tests/twister/pytest_integration/test_harness_pytest.py @@ -7,7 +7,6 @@ from pathlib import Path from unittest import mock import pytest - from twisterlib.harness import Pytest from twisterlib.platform import Platform from twisterlib.testinstance import TestInstance diff --git a/scripts/tests/twister/test_cmakecache.py b/scripts/tests/twister/test_cmakecache.py index 94dcfc1dd42..69d68b5ac39 100644 --- a/scripts/tests/twister/test_cmakecache.py +++ b/scripts/tests/twister/test_cmakecache.py @@ -10,7 +10,6 @@ from contextlib import nullcontext from unittest import mock import pytest - from twisterlib.cmakecache import CMakeCache, CMakeCacheEntry TESTDATA_1 = [ diff --git a/scripts/tests/twister/test_config_parser.py b/scripts/tests/twister/test_config_parser.py index f40858902a5..d0fe86f2426 100644 --- a/scripts/tests/twister/test_config_parser.py +++ b/scripts/tests/twister/test_config_parser.py @@ -12,7 +12,6 @@ from contextlib import nullcontext from unittest import mock import pytest - import scl from twisterlib.config_parser import ( ConfigurationError, diff --git a/scripts/tests/twister/test_environment.py b/scripts/tests/twister/test_environment.py index ad2b565093f..93c30e345e0 100644 --- a/scripts/tests/twister/test_environment.py +++ b/scripts/tests/twister/test_environment.py @@ -13,7 +13,6 @@ from contextlib import nullcontext from unittest import mock import pytest - import twisterlib.environment TESTDATA_1 = [ diff --git a/scripts/tests/twister/test_errors.py b/scripts/tests/twister/test_errors.py index e43c61bbfcd..18e9790ca4c 100644 --- a/scripts/tests/twister/test_errors.py +++ b/scripts/tests/twister/test_errors.py @@ -10,7 +10,6 @@ import os from pathlib import Path import pytest - from twisterlib.error import ConfigurationError, StatusAttributeError from twisterlib.harness import Test diff --git a/scripts/tests/twister/test_handlers.py b/scripts/tests/twister/test_handlers.py index 5fbedc21868..49139da52d2 100644 --- a/scripts/tests/twister/test_handlers.py +++ b/scripts/tests/twister/test_handlers.py @@ -19,9 +19,8 @@ from types import SimpleNamespace from unittest import mock import pytest -from serial import SerialException - import twisterlib.harness +from serial import SerialException from twisterlib.error import TwisterException from twisterlib.handlers import ( BinaryHandler, diff --git a/scripts/tests/twister/test_hardwaremap.py b/scripts/tests/twister/test_hardwaremap.py index 2abeb3cc449..5d0ea798ed6 100644 --- a/scripts/tests/twister/test_hardwaremap.py +++ b/scripts/tests/twister/test_hardwaremap.py @@ -11,7 +11,6 @@ from pathlib import Path from unittest import mock import pytest - from twisterlib.hardwaremap import DUT, HardwareMap diff --git a/scripts/tests/twister/test_harness.py b/scripts/tests/twister/test_harness.py index 7e6986524a8..d4a12d3074d 100644 --- a/scripts/tests/twister/test_harness.py +++ b/scripts/tests/twister/test_harness.py @@ -13,7 +13,6 @@ import textwrap from unittest import mock import pytest - from twisterlib.harness import ( Bsim, Console, diff --git a/scripts/tests/twister/test_log_helper.py b/scripts/tests/twister/test_log_helper.py index 719605ab0fe..1c8231c400f 100644 --- a/scripts/tests/twister/test_log_helper.py +++ b/scripts/tests/twister/test_log_helper.py @@ -11,7 +11,6 @@ from importlib import reload from unittest import mock import pytest - import twisterlib.log_helper TESTDATA = [ diff --git a/scripts/tests/twister/test_platform.py b/scripts/tests/twister/test_platform.py index ddb1e09ca35..7cc20e7e23c 100644 --- a/scripts/tests/twister/test_platform.py +++ b/scripts/tests/twister/test_platform.py @@ -11,7 +11,6 @@ from unittest import mock import pytest from pykwalify.errors import SchemaError - from twisterlib.platform import Platform, Simulator, generate_platforms TESTDATA_1 = [ diff --git a/scripts/tests/twister/test_quarantine.py b/scripts/tests/twister/test_quarantine.py index 7afb490ae91..fe714218a9a 100644 --- a/scripts/tests/twister/test_quarantine.py +++ b/scripts/tests/twister/test_quarantine.py @@ -11,7 +11,6 @@ import textwrap from unittest import mock import pytest - from twisterlib.quarantine import QuarantineData, QuarantineElement, QuarantineException TESTDATA_1 = [ diff --git a/scripts/tests/twister/test_runner.py b/scripts/tests/twister/test_runner.py index a9b879ef588..098f2fdf69c 100644 --- a/scripts/tests/twister/test_runner.py +++ b/scripts/tests/twister/test_runner.py @@ -20,7 +20,6 @@ from unittest import mock import pytest import yaml from elftools.elf.sections import SymbolTableSection - from twisterlib.error import BuildError from twisterlib.harness import Pytest from twisterlib.runner import CMake, ExecutionCounter, FilterBuilder, ProjectBuilder, TwisterRunner diff --git a/scripts/tests/twister/test_scl.py b/scripts/tests/twister/test_scl.py index 4f90bd81c03..f08ed30ee99 100644 --- a/scripts/tests/twister/test_scl.py +++ b/scripts/tests/twister/test_scl.py @@ -13,11 +13,10 @@ from importlib import reload from unittest import mock import pytest +import scl from pykwalify.errors import SchemaError from yaml.scanner import ScannerError -import scl - TESTDATA_1 = [ (False,), (True,), diff --git a/scripts/tests/twister/test_testinstance.py b/scripts/tests/twister/test_testinstance.py index eb430d7ba88..e28c5c3b9dd 100644 --- a/scripts/tests/twister/test_testinstance.py +++ b/scripts/tests/twister/test_testinstance.py @@ -13,7 +13,6 @@ from unittest import mock import pytest from expr_parser import reserved - from twisterlib.error import BuildError from twisterlib.handlers import QEMUHandler from twisterlib.platform import Simulator diff --git a/scripts/tests/twister/test_testplan.py b/scripts/tests/twister/test_testplan.py index d503db0cf6a..c3424efad0f 100644 --- a/scripts/tests/twister/test_testplan.py +++ b/scripts/tests/twister/test_testplan.py @@ -13,7 +13,6 @@ from pathlib import Path from unittest import mock import pytest - from twisterlib.error import TwisterRuntimeError from twisterlib.platform import Platform from twisterlib.quarantine import Quarantine diff --git a/scripts/tests/twister/test_testsuite.py b/scripts/tests/twister/test_testsuite.py index afdd7a7843b..511651d851e 100644 --- a/scripts/tests/twister/test_testsuite.py +++ b/scripts/tests/twister/test_testsuite.py @@ -12,7 +12,6 @@ from contextlib import nullcontext from unittest import mock import pytest - from twisterlib.error import TwisterException, TwisterRuntimeError from twisterlib.statuses import TwisterStatus from twisterlib.testsuite import ( diff --git a/scripts/tests/twister/test_twister.py b/scripts/tests/twister/test_twister.py index db2a08c189c..13182069a47 100644 --- a/scripts/tests/twister/test_twister.py +++ b/scripts/tests/twister/test_twister.py @@ -11,7 +11,6 @@ from pathlib import Path from unittest import mock import pytest - import scl from twisterlib.error import ConfigurationError from twisterlib.testplan import TwisterConfigParser