diff --git a/app.py b/app.py index a74cb5d..3ee3354 100644 --- a/app.py +++ b/app.py @@ -1,8 +1,8 @@ from __future__ import annotations +import logging from dataclasses import replace from datetime import datetime, time, timedelta -import logging from zoneinfo import ZoneInfo import folium diff --git a/pyproject.toml b/pyproject.toml index 93d06f1..4badaaf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ dependencies = [ [project.optional-dependencies] dev = [ "pytest>=8.0,<10.0", - "ruff>=0.11,<0.16", + "ruff>=0.11,<0.17", "pyright>=1.1.0,<2.0", ] diff --git a/src/geocoding.py b/src/geocoding.py index 041da88..3abf1cc 100644 --- a/src/geocoding.py +++ b/src/geocoding.py @@ -3,7 +3,6 @@ import logging from typing import Protocol - from src.cache import RateLimiter, TTLCache from src.config import Settings from src.http_client import build_http_session diff --git a/src/http_client.py b/src/http_client.py index dc6b251..6f96ede 100644 --- a/src/http_client.py +++ b/src/http_client.py @@ -1,7 +1,7 @@ from __future__ import annotations -from typing import Any import ssl +from typing import Any import requests from requests.adapters import HTTPAdapter diff --git a/src/mapview.py b/src/mapview.py index 173e3d5..a8dc69a 100644 --- a/src/mapview.py +++ b/src/mapview.py @@ -1,8 +1,9 @@ from __future__ import annotations +from typing import cast + import folium from branca.element import Element, Figure -from typing import cast from src.i18n import t from src.models import ( diff --git a/src/routing.py b/src/routing.py index 7715904..484d323 100644 --- a/src/routing.py +++ b/src/routing.py @@ -1,11 +1,10 @@ from __future__ import annotations -from dataclasses import replace import logging import math +from dataclasses import replace from typing import Protocol - from src.cache import RateLimiter, TTLCache from src.config import Settings from src.http_client import build_http_session diff --git a/src/scoring.py b/src/scoring.py index da24a99..62bbbe9 100644 --- a/src/scoring.py +++ b/src/scoring.py @@ -1,9 +1,9 @@ from __future__ import annotations -from datetime import datetime, timedelta import logging import math -from typing import Callable +from collections.abc import Callable +from datetime import datetime, timedelta from src.i18n import t from src.models import ( diff --git a/src/utils.py b/src/utils.py index ce8f297..5b4aef6 100644 --- a/src/utils.py +++ b/src/utils.py @@ -85,7 +85,7 @@ def format_distance_km(distance_m: float) -> str: def format_duration_minutes(duration_s: float) -> str: - total_minutes = int(round(duration_s / 60.0)) + total_minutes = round(duration_s / 60.0) hours, minutes = divmod(total_minutes, 60) if hours: return f"{hours}h {minutes}m" diff --git a/tests/test_providers.py b/tests/test_providers.py index 3a654d2..eea3849 100644 --- a/tests/test_providers.py +++ b/tests/test_providers.py @@ -1,7 +1,7 @@ from dataclasses import dataclass -from src.http_client import SystemSSLContextAdapter from src.geocoding import NominatimGeocoder +from src.http_client import SystemSSLContextAdapter from src.models import Coordinates from src.routing import OSRMRouter diff --git a/tests/test_repo_readiness.py b/tests/test_repo_readiness.py index 18b7007..63a9282 100644 --- a/tests/test_repo_readiness.py +++ b/tests/test_repo_readiness.py @@ -1,7 +1,7 @@ from __future__ import annotations -from pathlib import Path import shutil +from pathlib import Path from src import config @@ -17,12 +17,10 @@ def test_load_settings_reads_values_from_project_dotenv(monkeypatch) -> None: monkeypatch.delenv("SUNROUTER_ROUTER_BASE_URL", raising=False) monkeypatch.delenv("SUNROUTER_MAX_ALTERNATIVES", raising=False) Path(".env").write_text( - "\n".join( - [ - "SUNROUTER_DEFAULT_TIMEZONE=UTC", - "SUNROUTER_ROUTER_BASE_URL=https://example.test/route/v1", - "SUNROUTER_MAX_ALTERNATIVES=5", - ] + ( + "SUNROUTER_DEFAULT_TIMEZONE=UTC\n" + "SUNROUTER_ROUTER_BASE_URL=https://example.test/route/v1\n" + "SUNROUTER_MAX_ALTERNATIVES=5" ), encoding="utf-8", )