diff --git a/poetry.lock b/poetry.lock index 8fae8d821..945b1deff 100644 --- a/poetry.lock +++ b/poetry.lock @@ -626,13 +626,13 @@ i18n = ["Babel (>=2.7)"] [[package]] name = "license-expression" -version = "30.3.0" +version = "30.3.1" description = "license-expression is a comprehensive utility library to parse, compare, simplify and normalize license expressions (such as SPDX license expressions) using boolean logic." optional = false python-versions = ">=3.8" files = [ - {file = "license-expression-30.3.0.tar.gz", hash = "sha256:1295406f736b4f395ff069aec1cebfad53c0fcb3cf57df0f5ec58fc7b905aea5"}, - {file = "license_expression-30.3.0-py3-none-any.whl", hash = "sha256:ae0ba9a829d6909c785dc2f0131f13d10d68318e4a5f28af5ef152d6b52f9b41"}, + {file = "license_expression-30.3.1-py3-none-any.whl", hash = "sha256:97904b9185c7bbb1e98799606fa7424191c375e70ba63a524b6f7100e42ddc46"}, + {file = "license_expression-30.3.1.tar.gz", hash = "sha256:60d5bec1f3364c256a92b9a08583d7ea933c7aa272c8d36d04144a89a3858c01"}, ] [package.dependencies] @@ -1608,29 +1608,29 @@ release = ["pip-tools (>=6.12.1)", "toml (>=0.10.2)", "twine (>=4.0.2)"] [[package]] name = "ruff" -version = "0.5.7" +version = "0.6.2" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.5.7-py3-none-linux_armv6l.whl", hash = "sha256:548992d342fc404ee2e15a242cdbea4f8e39a52f2e7752d0e4cbe88d2d2f416a"}, - {file = "ruff-0.5.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:00cc8872331055ee017c4f1071a8a31ca0809ccc0657da1d154a1d2abac5c0be"}, - {file = "ruff-0.5.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:eaf3d86a1fdac1aec8a3417a63587d93f906c678bb9ed0b796da7b59c1114a1e"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a01c34400097b06cf8a6e61b35d6d456d5bd1ae6961542de18ec81eaf33b4cb8"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fcc8054f1a717e2213500edaddcf1dbb0abad40d98e1bd9d0ad364f75c763eea"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7f70284e73f36558ef51602254451e50dd6cc479f8b6f8413a95fcb5db4a55fc"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:a78ad870ae3c460394fc95437d43deb5c04b5c29297815a2a1de028903f19692"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9ccd078c66a8e419475174bfe60a69adb36ce04f8d4e91b006f1329d5cd44bcf"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7e31c9bad4ebf8fdb77b59cae75814440731060a09a0e0077d559a556453acbb"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d796327eed8e168164346b769dd9a27a70e0298d667b4ecee6877ce8095ec8e"}, - {file = "ruff-0.5.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:4a09ea2c3f7778cc635e7f6edf57d566a8ee8f485f3c4454db7771efb692c499"}, - {file = "ruff-0.5.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:a36d8dcf55b3a3bc353270d544fb170d75d2dff41eba5df57b4e0b67a95bb64e"}, - {file = "ruff-0.5.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:9369c218f789eefbd1b8d82a8cf25017b523ac47d96b2f531eba73770971c9e5"}, - {file = "ruff-0.5.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:b88ca3db7eb377eb24fb7c82840546fb7acef75af4a74bd36e9ceb37a890257e"}, - {file = "ruff-0.5.7-py3-none-win32.whl", hash = "sha256:33d61fc0e902198a3e55719f4be6b375b28f860b09c281e4bdbf783c0566576a"}, - {file = "ruff-0.5.7-py3-none-win_amd64.whl", hash = "sha256:083bbcbe6fadb93cd86709037acc510f86eed5a314203079df174c40bbbca6b3"}, - {file = "ruff-0.5.7-py3-none-win_arm64.whl", hash = "sha256:2dca26154ff9571995107221d0aeaad0e75a77b5a682d6236cf89a58c70b76f4"}, - {file = "ruff-0.5.7.tar.gz", hash = "sha256:8dfc0a458797f5d9fb622dd0efc52d796f23f0a1493a9527f4e49a550ae9a7e5"}, + {file = "ruff-0.6.2-py3-none-linux_armv6l.whl", hash = "sha256:5c8cbc6252deb3ea840ad6a20b0f8583caab0c5ef4f9cca21adc5a92b8f79f3c"}, + {file = "ruff-0.6.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:17002fe241e76544448a8e1e6118abecbe8cd10cf68fde635dad480dba594570"}, + {file = "ruff-0.6.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3dbeac76ed13456f8158b8f4fe087bf87882e645c8e8b606dd17b0b66c2c1158"}, + {file = "ruff-0.6.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:094600ee88cda325988d3f54e3588c46de5c18dae09d683ace278b11f9d4d534"}, + {file = "ruff-0.6.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:316d418fe258c036ba05fbf7dfc1f7d3d4096db63431546163b472285668132b"}, + {file = "ruff-0.6.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d72b8b3abf8a2d51b7b9944a41307d2f442558ccb3859bbd87e6ae9be1694a5d"}, + {file = "ruff-0.6.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:2aed7e243be68487aa8982e91c6e260982d00da3f38955873aecd5a9204b1d66"}, + {file = "ruff-0.6.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d371f7fc9cec83497fe7cf5eaf5b76e22a8efce463de5f775a1826197feb9df8"}, + {file = "ruff-0.6.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8f310d63af08f583363dfb844ba8f9417b558199c58a5999215082036d795a1"}, + {file = "ruff-0.6.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7db6880c53c56addb8638fe444818183385ec85eeada1d48fc5abe045301b2f1"}, + {file = "ruff-0.6.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:1175d39faadd9a50718f478d23bfc1d4da5743f1ab56af81a2b6caf0a2394f23"}, + {file = "ruff-0.6.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:5b939f9c86d51635fe486585389f54582f0d65b8238e08c327c1534844b3bb9a"}, + {file = "ruff-0.6.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:d0d62ca91219f906caf9b187dea50d17353f15ec9bb15aae4a606cd697b49b4c"}, + {file = "ruff-0.6.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:7438a7288f9d67ed3c8ce4d059e67f7ed65e9fe3aa2ab6f5b4b3610e57e3cb56"}, + {file = "ruff-0.6.2-py3-none-win32.whl", hash = "sha256:279d5f7d86696df5f9549b56b9b6a7f6c72961b619022b5b7999b15db392a4da"}, + {file = "ruff-0.6.2-py3-none-win_amd64.whl", hash = "sha256:d9f3469c7dd43cd22eb1c3fc16926fb8258d50cb1b216658a07be95dd117b0f2"}, + {file = "ruff-0.6.2-py3-none-win_arm64.whl", hash = "sha256:f28fcd2cd0e02bdf739297516d5643a945cc7caf09bd9bcb4d932540a5ea4fa9"}, + {file = "ruff-0.6.2.tar.gz", hash = "sha256:239ee6beb9e91feb8e0ec384204a763f36cb53fb895a1a364618c6abb076b3be"}, ] [[package]] @@ -1843,13 +1843,13 @@ files = [ [[package]] name = "tomlkit" -version = "0.13.0" +version = "0.13.2" description = "Style preserving TOML library" optional = false python-versions = ">=3.8" files = [ - {file = "tomlkit-0.13.0-py3-none-any.whl", hash = "sha256:7075d3042d03b80f603482d69bf0c8f345c2b30e41699fd8883227f89972b264"}, - {file = "tomlkit-0.13.0.tar.gz", hash = "sha256:08ad192699734149f5b97b45f1f18dad7eb1b6d16bc72ad0c2335772650d7b72"}, + {file = "tomlkit-0.13.2-py3-none-any.whl", hash = "sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde"}, + {file = "tomlkit-0.13.2.tar.gz", hash = "sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79"}, ] [[package]] @@ -2194,4 +2194,4 @@ cffi = ["cffi (>=1.11)"] [metadata] lock-version = "2.0" python-versions = ">=3.11,<3.13" -content-hash = "d952c50a017dc6f278a22bab11f2c8b917cf539f8a85fba4c8a3e759ec7486a5" +content-hash = "684e1b9ed3067323b46ccdd1e77f89beba346e11609bdc2ea9250de2aec23869" diff --git a/pyproject.toml b/pyproject.toml index ffff37b97..98c9b7140 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ sphinx-rtd-theme = ">=1,<3" reuse = "^4.0" construct-typing = ">=0.5.2,<0.7.0" pytest-cov = ">=4,<6" -ruff = "^0.5.0" +ruff = "^0.6.0" [tool.poetry.scripts] "gallia" = "gallia.cli:main" 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 e8001d843..4685e2c81 100644 --- a/src/hr/__init__.py +++ b/src/hr/__init__.py @@ -11,6 +11,7 @@ from typing import cast import msgspec + from gallia.log import ColorMode, PenlogPriority, PenlogReader, resolve_color_mode diff --git a/src/opennetzteil/cli.py b/src/opennetzteil/cli.py index 6a6524ef0..059a159ce 100644 --- a/src/opennetzteil/cli.py +++ b/src/opennetzteil/cli.py @@ -9,7 +9,6 @@ from gallia.config import load_config_file from gallia.powersupply import PowerSupplyURI from gallia.utils import strtobool - from opennetzteil import 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 a4b907343..74eafab0d 100644 --- a/tests/pytest/test_config.py +++ b/tests/pytest/test_config.py @@ -7,9 +7,10 @@ import platformdirs import pytest -from gallia.config import get_config_dirs, load_config_file from pygit2 import init_repository +from gallia.config import get_config_dirs, load_config_file + def test_config_discovery_git(tmp_path: Path) -> None: testrepo = tmp_path.joinpath("testrepo") 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