Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ packages =
_balder.objects
_balder.objects.devices
_balder.objects.connections
_balder.utils
balder
install_requires =

Expand Down
2 changes: 1 addition & 1 deletion src/_balder/cnnrelations/base_connection_relation.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations
from typing import List, Union, Type, Dict, TypeVar, TYPE_CHECKING
from abc import ABC, abstractmethod
from ..utils import cnn_type_check_and_convert # pylint: disable=cyclic-import
from _balder.utils.functions import cnn_type_check_and_convert

if TYPE_CHECKING:
from ..connection import Connection
Expand Down
4 changes: 2 additions & 2 deletions src/_balder/collector.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import pathlib
import functools
import importlib.util
from _balder.utils import get_class_that_defines_method, inspect_method
from _balder.utils.functions import get_class_that_defines_method, inspect_method
from _balder.setup import Setup
from _balder.device import Device
from _balder.feature import Feature
Expand All @@ -23,7 +23,7 @@
from _balder.controllers import ScenarioController, SetupController, DeviceController, VDeviceController, \
FeatureController, NormalScenarioSetupController
from _balder.exceptions import DuplicateForVDeviceError, UnknownVDeviceException
from _balder.utils import get_scenario_inheritance_list_of
from _balder.utils.functions import get_scenario_inheritance_list_of

if TYPE_CHECKING:
from _balder.plugin_manager import PluginManager
Expand Down
2 changes: 1 addition & 1 deletion src/_balder/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from _balder.device import Device
from _balder.exceptions import IllegalConnectionTypeError
from _balder.cnnrelations import AndConnectionRelation, OrConnectionRelation
from _balder.utils import cnn_type_check_and_convert
from _balder.utils.functions import cnn_type_check_and_convert


class ConnectionType(type):
Expand Down
2 changes: 1 addition & 1 deletion src/_balder/controllers/scenario_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from _balder.parametrization import FeatureAccessSelector, Parameter
from _balder.exceptions import UnclearAssignableFeatureConnectionError, ConnectionIntersectionError, \
MultiInheritanceError
from _balder.utils import get_scenario_inheritance_list_of
from _balder.utils.functions import get_scenario_inheritance_list_of

logger = logging.getLogger(__file__)

Expand Down
2 changes: 1 addition & 1 deletion src/_balder/executor/parametrized_testcase_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import Any, TYPE_CHECKING

from collections import OrderedDict
from _balder.utils import inspect_method
from _balder.utils.functions import inspect_method
from .testcase_executor import TestcaseExecutor

if TYPE_CHECKING:
Expand Down
4 changes: 2 additions & 2 deletions src/_balder/executor/testcase_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import traceback

from _balder.executor.basic_executable_executor import BasicExecutableExecutor
from _balder.executor.mixin_can_be_covered_by_executor import MixinCanBeCoveredByExecutor
from _balder.fixture_execution_level import FixtureExecutionLevel
from _balder.previous_executor_mark import PreviousExecutorMark
from _balder.testresult import ResultState, TestcaseResult
from _balder.utils import inspect_method
from _balder.utils.functions import inspect_method
from _balder.utils.mixin_can_be_covered_by_executor import MixinCanBeCoveredByExecutor

if TYPE_CHECKING:
from _balder.executor.scenario_executor import ScenarioExecutor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
from collections import OrderedDict

from _balder.executor.basic_executor import BasicExecutor
from _balder.executor.mixin_can_be_covered_by_executor import MixinCanBeCoveredByExecutor
from _balder.executor.parametrized_testcase_executor import ParametrizedTestcaseExecutor
from _balder.parametrization import Parameter
from _balder.previous_executor_mark import PreviousExecutorMark
from _balder.testresult import BranchBodyResult
from _balder.utils.mixin_can_be_covered_by_executor import MixinCanBeCoveredByExecutor

if TYPE_CHECKING:
from _balder.executor.scenario_executor import ScenarioExecutor
Expand Down
2 changes: 1 addition & 1 deletion src/_balder/fixture_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
UnclearUniqueClassReference

if TYPE_CHECKING:
from _balder.utils import MethodLiteralType
from _balder.utils.functions import MethodLiteralType
from _balder.executor.executor_tree import ExecutorTree


Expand Down
2 changes: 1 addition & 1 deletion src/_balder/fixture_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import Union, Type, Callable, Generator, TYPE_CHECKING
import dataclasses

from .utils import MethodLiteralType
from .utils.typings import MethodLiteralType

if TYPE_CHECKING:
from _balder.scenario import Scenario
Expand Down
Empty file added src/_balder/utils/__init__.py
Empty file.
11 changes: 5 additions & 6 deletions src/_balder/utils.py → src/_balder/utils/functions.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
from __future__ import annotations
from typing import List, Type, Tuple, Union, Literal, TYPE_CHECKING
from typing import List, Type, Tuple, Union, TYPE_CHECKING

import sys
import inspect
from _balder.scenario import Scenario
from _balder.exceptions import InheritanceError

MethodLiteralType = Literal["function", "classmethod", "staticmethod", "instancemethod"]

if TYPE_CHECKING:
from _balder.connection import Connection
from _balder.cnnrelations.base_connection_relation import BaseConnectionRelationT
from _balder.utils.typings import MethodLiteralType


def get_scenario_inheritance_list_of(scenario: Type[Scenario]) -> List[Type[Scenario]]:
Expand Down Expand Up @@ -57,9 +56,9 @@ def cnn_type_check_and_convert(elem: Union[Connection, Type[Connection], BaseCon
:param elem: the connection object to be converted/checked
"""

from .connection import Connection # pylint: disable=import-outside-toplevel
from .cnnrelations.and_connection_relation import AndConnectionRelation # pylint: disable=import-outside-toplevel
from .cnnrelations.or_connection_relation import OrConnectionRelation # pylint: disable=import-outside-toplevel
from ..connection import Connection # pylint: disable=import-outside-toplevel
from ..cnnrelations.and_connection_relation import AndConnectionRelation # pylint: disable=import-outside-toplevel
from ..cnnrelations.or_connection_relation import OrConnectionRelation # pylint: disable=import-outside-toplevel

if isinstance(elem, type):
if issubclass(elem, Connection):
Expand Down
4 changes: 4 additions & 0 deletions src/_balder/utils/typings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from typing import Literal


MethodLiteralType = Literal["function", "classmethod", "staticmethod", "instancemethod"]