scripts: Restructure imports

scripts/pylib/twister/twisterlib/config_parser.py

@@ -6,8 +6,8 @@
 import copy
 import warnings
 
-import scl
-from twisterlib.error import ConfigurationError
+import pylib.twister.scl as scl
+from pylib.twister.twisterlib.error import ConfigurationError
 
 
 def extract_fields_from_arg_list(target_fields: set, arg_list: str | list):

scripts/pylib/twister/twisterlib/environment.py

@@ -21,10 +21,10 @@
 from pathlib import Path
 
 import zephyr_module
-from twisterlib.constants import SUPPORTED_SIMS
-from twisterlib.coverage import supported_coverage_formats
-from twisterlib.error import TwisterRuntimeError
-from twisterlib.log_helper import log_command
+from pylib.twister.twisterlib.constants import SUPPORTED_SIMS
+from pylib.twister.twisterlib.coverage import supported_coverage_formats
+from pylib.twister.twisterlib.error import TwisterRuntimeError
+from pylib.twister.twisterlib.log_helper import log_command
 
 logger = logging.getLogger('twister')
 logger.setLevel(logging.DEBUG)

scripts/pylib/twister/twisterlib/handlers.py

@@ -25,13 +25,11 @@
 from queue import Empty, Queue
 
 import psutil
-from twisterlib.environment import ZEPHYR_BASE, strip_ansi_sequences
-from twisterlib.error import TwisterException
-from twisterlib.platform import Platform
-from twisterlib.statuses import TwisterStatus
-
-sys.path.insert(0, os.path.join(ZEPHYR_BASE, "scripts/pylib/build_helpers"))
-from domains import Domains
+from pylib.build_helpers.domains import Domains
+from pylib.twister.twisterlib.environment import ZEPHYR_BASE, strip_ansi_sequences
+from pylib.twister.twisterlib.error import TwisterException
+from pylib.twister.twisterlib.platform import Platform
+from pylib.twister.twisterlib.statuses import TwisterStatus
 
 try:
     import serial

scripts/pylib/twister/twisterlib/hardwaremap.py

@@ -11,10 +11,10 @@
 from multiprocessing import Lock, Value
 from pathlib import Path
 
-import scl
+import pylib.twister.scl as scl
 import yaml
 from natsort import natsorted
-from twisterlib.environment import ZEPHYR_BASE
+from pylib.twister.twisterlib.environment import ZEPHYR_BASE
 
 try:
     # Use the C LibYAML parser if available, rather than the Python parser.

scripts/pylib/twister/twisterlib/harness.py

@@ -18,14 +18,14 @@
 
 import junitparser.junitparser as junit
 import yaml
+from pylib.twister.twisterlib.constants import SUPPORTED_SIMS_IN_PYTEST
+from pylib.twister.twisterlib.environment import PYTEST_PLUGIN_INSTALLED, ZEPHYR_BASE
+from pylib.twister.twisterlib.error import ConfigurationError, StatusAttributeError
+from pylib.twister.twisterlib.handlers import Handler, terminate_process
+from pylib.twister.twisterlib.reports import ReportStatus
+from pylib.twister.twisterlib.statuses import TwisterStatus
+from pylib.twister.twisterlib.testinstance import TestInstance
 from pytest import ExitCode
-from twisterlib.constants import SUPPORTED_SIMS_IN_PYTEST
-from twisterlib.environment import PYTEST_PLUGIN_INSTALLED, ZEPHYR_BASE
-from twisterlib.error import ConfigurationError, StatusAttributeError
-from twisterlib.handlers import Handler, terminate_process
-from twisterlib.reports import ReportStatus
-from twisterlib.statuses import TwisterStatus
-from twisterlib.testinstance import TestInstance
 
 logger = logging.getLogger('twister')
 logger.setLevel(logging.DEBUG)

scripts/pylib/twister/twisterlib/package.py

@@ -7,7 +7,7 @@
 import os
 import tarfile
 
-from twisterlib.statuses import TwisterStatus
+from pylib.twister.twisterlib.statuses import TwisterStatus
 
 
 class Artifacts:

scripts/pylib/twister/twisterlib/platform.py

@@ -13,9 +13,9 @@
 from itertools import groupby
 
 import list_boards
-import scl
-from twisterlib.constants import SUPPORTED_SIMS
-from twisterlib.environment import ZEPHYR_BASE
+import pylib.twister.scl as scl
+from pylib.twister.twisterlib.constants import SUPPORTED_SIMS
+from pylib.twister.twisterlib.environment import ZEPHYR_BASE
 
 logger = logging.getLogger('twister')
 logger.setLevel(logging.DEBUG)

scripts/pylib/twister/twisterlib/reports.py

@@ -14,7 +14,7 @@
 from pathlib import Path
 
 from colorama import Fore
-from twisterlib.statuses import TwisterStatus
+from pylib.twister.twisterlib.statuses import TwisterStatus
 
 logger = logging.getLogger('twister')
 logger.setLevel(logging.DEBUG)

scripts/pylib/twister/twisterlib/runner.py

@@ -26,37 +26,34 @@
 from elftools.elf.elffile import ELFFile
 from elftools.elf.sections import SymbolTableSection
 from packaging import version
-from twisterlib.cmakecache import CMakeCache
-from twisterlib.environment import canonical_zephyr_base
-from twisterlib.error import BuildError, ConfigurationError, StatusAttributeError
-from twisterlib.statuses import TwisterStatus
+from pylib.twister.twisterlib.cmakecache import CMakeCache
+from pylib.twister.twisterlib.environment import canonical_zephyr_base
+from pylib.twister.twisterlib.error import BuildError, ConfigurationError, StatusAttributeError
+from pylib.twister.twisterlib.statuses import TwisterStatus
 
 if version.parse(elftools.__version__) < version.parse('0.24'):
     sys.exit("pyelftools is out of date, need version 0.24 or later")
 
 # Job server only works on Linux for now.
 if sys.platform == 'linux':
-    from twisterlib.jobserver import GNUMakeJobClient, GNUMakeJobServer, JobClient
-
-from twisterlib.environment import ZEPHYR_BASE
-
-sys.path.insert(0, os.path.join(ZEPHYR_BASE, "scripts/pylib/build_helpers"))
-from domains import Domains
-from twisterlib.coverage import run_coverage_instance
-from twisterlib.environment import TwisterEnv
-from twisterlib.harness import Ctest, HarnessImporter, Pytest
-from twisterlib.log_helper import log_command
-from twisterlib.platform import Platform
-from twisterlib.testinstance import TestInstance
-from twisterlib.testplan import change_skip_to_error_if_integration
-from twisterlib.testsuite import TestSuite
+    from pylib.twister.twisterlib.jobserver import GNUMakeJobClient, GNUMakeJobServer, JobClient
+
+from pylib.build_helpers.domains import Domains
+from pylib.twister.twisterlib.coverage import run_coverage_instance
+from pylib.twister.twisterlib.environment import TwisterEnv
+from pylib.twister.twisterlib.harness import Ctest, HarnessImporter, Pytest
+from pylib.twister.twisterlib.log_helper import log_command
+from pylib.twister.twisterlib.platform import Platform
+from pylib.twister.twisterlib.testinstance import TestInstance
+from pylib.twister.twisterlib.testplan import change_skip_to_error_if_integration
+from pylib.twister.twisterlib.testsuite import TestSuite
 
 try:
     from yaml import CSafeLoader as SafeLoader
 except ImportError:
     from yaml import SafeLoader
 
-import expr_parser
+import pylib.twister.expr_parser
 from anytree import Node, RenderTree
 
 logger = logging.getLogger('twister')
@@ -852,7 +849,7 @@ def parse_generated(self, filter_stages=None):
                         edt = pickle.load(f)
                 else:
                     edt = None
-                ret = expr_parser.parse(self.testsuite.filter, filter_data, edt)
+                ret = pylib.twister.expr_parser.parse(self.testsuite.filter, filter_data, edt)
 
             except (ValueError, SyntaxError) as se:
                 sys.stderr.write(f"Failed processing {self.testsuite.yamlfile}\n")
@@ -1965,7 +1962,7 @@ def add_tasks_to_queue(
                 if instance.testsuite.filter:
                     instance.filter_stages = self.get_cmake_filter_stages(
                         instance.testsuite.filter,
-                        expr_parser.reserved.keys()
+                        pylib.twister.expr_parser.reserved.keys()
                     )
 
                 if test_only and instance.run:

scripts/pylib/twister/twisterlib/size_calc.py

@@ -10,7 +10,7 @@
 import subprocess
 import sys
 
-from twisterlib.error import TwisterRuntimeError
+from pylib.twister.twisterlib.error import TwisterRuntimeError
 
 logger = logging.getLogger('twister')
 logger.setLevel(logging.DEBUG)

scripts/pylib/twister/twisterlib/testinstance.py

@@ -15,25 +15,25 @@
 import random
 from enum import Enum
 
-from twisterlib.constants import (
+from pylib.twister.twisterlib.constants import (
     SUPPORTED_SIMS,
     SUPPORTED_SIMS_IN_PYTEST,
     SUPPORTED_SIMS_WITH_EXEC,
 )
-from twisterlib.environment import TwisterEnv
-from twisterlib.error import BuildError, StatusAttributeError
-from twisterlib.handlers import (
+from pylib.twister.twisterlib.environment import TwisterEnv
+from pylib.twister.twisterlib.error import BuildError, StatusAttributeError
+from pylib.twister.twisterlib.handlers import (
     BinaryHandler,
     DeviceHandler,
     Handler,
     QEMUHandler,
     QEMUWinHandler,
     SimulationHandler,
 )
-from twisterlib.platform import Platform
-from twisterlib.size_calc import SizeCalculator
-from twisterlib.statuses import TwisterStatus
-from twisterlib.testsuite import TestCase, TestSuite
+from pylib.twister.twisterlib.platform import Platform
+from pylib.twister.twisterlib.size_calc import SizeCalculator
+from pylib.twister.twisterlib.statuses import TwisterStatus
+from pylib.twister.twisterlib.testsuite import TestCase, TestSuite
 
 logger = logging.getLogger('twister')
 logger.setLevel(logging.DEBUG)

scripts/pylib/twister/twisterlib/testplan.py

@@ -27,14 +27,14 @@
 except ImportError:
     print("Install the anytree module to use the --test-tree option")
 
-import scl
-from twisterlib.config_parser import TwisterConfigParser
-from twisterlib.error import TwisterRuntimeError
-from twisterlib.platform import Platform, generate_platforms
-from twisterlib.quarantine import Quarantine
-from twisterlib.statuses import TwisterStatus
-from twisterlib.testinstance import TestInstance
-from twisterlib.testsuite import TestSuite, scan_testsuite_path
+import pylib.twister.scl as scl
+from pylib.twister.twisterlib.config_parser import TwisterConfigParser
+from pylib.twister.twisterlib.error import TwisterRuntimeError
+from pylib.twister.twisterlib.platform import Platform, generate_platforms
+from pylib.twister.twisterlib.quarantine import Quarantine
+from pylib.twister.twisterlib.statuses import TwisterStatus
+from pylib.twister.twisterlib.testinstance import TestInstance
+from pylib.twister.twisterlib.testsuite import TestSuite, scan_testsuite_path
 from zephyr_module import parse_modules
 
 logger = logging.getLogger('twister')

scripts/pylib/twister/twisterlib/testsuite.py

@@ -12,10 +12,14 @@
 from enum import Enum
 from pathlib import Path
 
-from twisterlib.environment import canonical_zephyr_base
-from twisterlib.error import StatusAttributeError, TwisterException, TwisterRuntimeError
-from twisterlib.mixins import DisablePyTestCollectionMixin
-from twisterlib.statuses import TwisterStatus
+from pylib.twister.twisterlib.environment import canonical_zephyr_base
+from pylib.twister.twisterlib.error import (
+    StatusAttributeError,
+    TwisterException,
+    TwisterRuntimeError,
+)
+from pylib.twister.twisterlib.mixins import DisablePyTestCollectionMixin
+from pylib.twister.twisterlib.statuses import TwisterStatus
 
 logger = logging.getLogger('twister')
 logger.setLevel(logging.DEBUG)

scripts/pylib/twister/twisterlib/twister_main.py

@@ -12,14 +12,14 @@
 
 import colorama
 from colorama import Fore
-from twisterlib.coverage import run_coverage
-from twisterlib.environment import TwisterEnv
-from twisterlib.hardwaremap import HardwareMap
-from twisterlib.package import Artifacts
-from twisterlib.reports import Reporting
-from twisterlib.runner import TwisterRunner
-from twisterlib.statuses import TwisterStatus
-from twisterlib.testplan import TestPlan
+from pylib.twister.twisterlib.coverage import run_coverage
+from pylib.twister.twisterlib.environment import TwisterEnv
+from pylib.twister.twisterlib.hardwaremap import HardwareMap
+from pylib.twister.twisterlib.package import Artifacts
+from pylib.twister.twisterlib.reports import Reporting
+from pylib.twister.twisterlib.runner import TwisterRunner
+from pylib.twister.twisterlib.statuses import TwisterStatus
+from pylib.twister.twisterlib.testplan import TestPlan
 
 logger = logging.getLogger("twister")
 logger.setLevel(logging.DEBUG)