diff --git a/src/cursed_hr/cursed_hr.py b/src/cursed_hr/cursed_hr.py index e679eb3e3..0efad240c 100644 --- a/src/cursed_hr/cursed_hr.py +++ b/src/cursed_hr/cursed_hr.py @@ -25,6 +25,7 @@ import platformdirs import zstandard as zstd + from gallia.log import PenlogPriority, PenlogRecord from gallia.services.uds.core.service import NegativeResponse, UDSRequest, UDSResponse diff --git a/src/gallia/powersupply.py b/src/gallia/powersupply.py index 5edfca218..87e10f9b2 100644 --- a/src/gallia/powersupply.py +++ b/src/gallia/powersupply.py @@ -8,11 +8,10 @@ from collections.abc import Awaitable, Callable from functools import partial -from opennetzteil import netzteile -from opennetzteil.netzteil import BaseNetzteil - from gallia.log import get_logger from gallia.transports import TargetURI +from opennetzteil import netzteile +from opennetzteil.netzteil import BaseNetzteil logger = get_logger(__name__) diff --git a/src/hr/__init__.py b/src/hr/__init__.py index a51e65f04..ee0d03a3d 100644 --- a/src/hr/__init__.py +++ b/src/hr/__init__.py @@ -11,6 +11,7 @@ from typing import cast import msgspec + from gallia import exitcodes from gallia.log import ColorMode, PenlogPriority, PenlogReader, resolve_color_mode diff --git a/src/opennetzteil/cli.py b/src/opennetzteil/cli.py index 728a176b9..458340a88 100644 --- a/src/opennetzteil/cli.py +++ b/src/opennetzteil/cli.py @@ -4,6 +4,8 @@ from abc import ABC from typing import Any, Literal, Self +from pydantic import field_serializer, model_validator + from gallia.cli import parse_and_run from gallia.command import AsyncScript from gallia.command.base import AsyncScriptConfig, ScannerConfig @@ -11,8 +13,6 @@ from gallia.powersupply import PowerSupplyURI from gallia.transports import TargetURI from gallia.utils import strtobool -from pydantic import field_serializer, model_validator - from opennetzteil import BaseNetzteil, netzteile diff --git a/src/opennetzteil/devices/http/client.py b/src/opennetzteil/devices/http/client.py index 0bfe43d19..1c12da1db 100644 --- a/src/opennetzteil/devices/http/client.py +++ b/src/opennetzteil/devices/http/client.py @@ -8,8 +8,8 @@ from urllib.parse import urljoin import httpx -from gallia.transports import TargetURI +from gallia.transports import TargetURI from opennetzteil.exceptions import OperationNotSupportedError from opennetzteil.netzteil import BaseNetzteil diff --git a/src/opennetzteil/devices/rs/hmc804.py b/src/opennetzteil/devices/rs/hmc804.py index f7458c3fa..ae7c7aeba 100644 --- a/src/opennetzteil/devices/rs/hmc804.py +++ b/src/opennetzteil/devices/rs/hmc804.py @@ -8,7 +8,6 @@ from typing import Any from gallia.utils import strtobool - from opennetzteil.exceptions import OperationNotSupportedError from opennetzteil.netzteil import BaseNetzteil diff --git a/tests/pytest/test_config.py b/tests/pytest/test_config.py index e66e41c80..a8cb80b8b 100644 --- a/tests/pytest/test_config.py +++ b/tests/pytest/test_config.py @@ -9,6 +9,7 @@ import platformdirs import pytest + from gallia.config import get_config_dirs, load_config_file diff --git a/tests/pytest/test_helpers.py b/tests/pytest/test_helpers.py index a9c8cd7a5..57b762120 100644 --- a/tests/pytest/test_helpers.py +++ b/tests/pytest/test_helpers.py @@ -3,6 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 import pytest + from gallia.log import setup_logging from gallia.services.uds.core.utils import ( address_and_size_length, diff --git a/tests/pytest/test_hsfz.py b/tests/pytest/test_hsfz.py index 53349e361..f49f50563 100644 --- a/tests/pytest/test_hsfz.py +++ b/tests/pytest/test_hsfz.py @@ -6,6 +6,7 @@ from collections.abc import AsyncIterator import pytest + from gallia.services.uds.core.client import UDSClient from gallia.services.uds.core.service import PositiveResponse from gallia.transports.base import BaseTransport, TargetURI diff --git a/tests/pytest/test_target_uris.py b/tests/pytest/test_target_uris.py index aa70569ce..7aca2b55c 100644 --- a/tests/pytest/test_target_uris.py +++ b/tests/pytest/test_target_uris.py @@ -7,11 +7,12 @@ assert sys.platform.startswith("linux"), "unsupported platform" import pytest +from pydantic import ValidationError + from gallia.transports import TargetURI from gallia.transports.doip import DoIPConfig from gallia.transports.isotp import ISOTPConfig from gallia.transports.schemes import TransportScheme -from pydantic import ValidationError uris = [ "doip://127.0.0.1:13400?src_addr=1&target_addr=1", diff --git a/tests/pytest/test_transports.py b/tests/pytest/test_transports.py index d8002ce86..36f48702c 100644 --- a/tests/pytest/test_transports.py +++ b/tests/pytest/test_transports.py @@ -7,6 +7,7 @@ from collections.abc import AsyncIterator, Callable import pytest + from gallia.log import setup_logging from gallia.transports import BaseTransport, TargetURI, TCPLinesTransport, TCPTransport