From 2ed22ee458ad3fbd37e39fa3e8e4c5e7ea9591a3 Mon Sep 17 00:00:00 2001 From: ivanprytula Date: Mon, 16 Dec 2024 17:26:32 +0100 Subject: [PATCH] add and update code with pyupdate to 3.13 version --- .pre-commit-config.yaml | 6 ++++++ microservices/backend/app/api/deps.py | 2 +- microservices/backend/app/core/config.py | 3 +-- microservices/backend/app/tests/conftest.py | 4 ++-- microservices/backend/compose.override.yaml | 2 +- microservices/backend/pyproject.toml | 1 + microservices/backend/uv.lock | 2 ++ 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 70dc549..3244a72 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,6 +35,12 @@ repos: # Run the formatter. - id: ruff-format + - repo: https://github.com/asottile/pyupgrade + rev: v3.19.0 + hooks: + - id: pyupgrade + args: [--py313-plus] + # sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date ci: autoupdate_schedule: weekly diff --git a/microservices/backend/app/api/deps.py b/microservices/backend/app/api/deps.py index c94e3da..55005c9 100644 --- a/microservices/backend/app/api/deps.py +++ b/microservices/backend/app/api/deps.py @@ -16,7 +16,7 @@ reusable_oauth2 = OAuth2PasswordBearer(tokenUrl=f"{settings.API_V1_STR}/login/access-token") -def get_db() -> Generator[Session, None, None]: +def get_db() -> Generator[Session]: with Session(engine) as session: yield session diff --git a/microservices/backend/app/core/config.py b/microservices/backend/app/core/config.py index 5216620..01c5332 100644 --- a/microservices/backend/app/core/config.py +++ b/microservices/backend/app/core/config.py @@ -1,6 +1,6 @@ import secrets import warnings -from typing import Annotated, Any, Literal +from typing import Annotated, Any, Literal, Self from pydantic import ( AnyUrl, @@ -12,7 +12,6 @@ ) from pydantic_core import MultiHostUrl from pydantic_settings import BaseSettings, SettingsConfigDict -from typing_extensions import Self def parse_cors(v: Any) -> list[str] | str: diff --git a/microservices/backend/app/tests/conftest.py b/microservices/backend/app/tests/conftest.py index 48c8390..1b55e5a 100644 --- a/microservices/backend/app/tests/conftest.py +++ b/microservices/backend/app/tests/conftest.py @@ -13,7 +13,7 @@ @pytest.fixture(scope="session", autouse=True) -def db() -> Generator[Session, None, None]: +def db() -> Generator[Session]: with Session(engine) as session: init_db(session) yield session @@ -25,7 +25,7 @@ def db() -> Generator[Session, None, None]: @pytest.fixture(scope="module") -def client() -> Generator[TestClient, None, None]: +def client() -> Generator[TestClient]: with TestClient(app) as c: yield c diff --git a/microservices/backend/compose.override.yaml b/microservices/backend/compose.override.yaml index 7268286..089df5b 100644 --- a/microservices/backend/compose.override.yaml +++ b/microservices/backend/compose.override.yaml @@ -36,7 +36,7 @@ services: - ./backend/htmlcov:/app/htmlcov environment: SMTP_HOST: "localhost" - SMTP_PORT: "9025" + SMTP_PORT: "1025" SMTP_TLS: "false" EMAILS_FROM_EMAIL: "noreply@example.com" diff --git a/microservices/backend/pyproject.toml b/microservices/backend/pyproject.toml index 7638b87..b66daf1 100644 --- a/microservices/backend/pyproject.toml +++ b/microservices/backend/pyproject.toml @@ -15,6 +15,7 @@ dependencies = [ "pydantic-settings>=2.2.1,<3.0.0", "pydantic[email]>=2.10.3", "pyjwt>=2.10.1", + "python-multipart>=0.0.7,<1.0.0", "sqlmodel>=0.0.22,<1.0.0", "tenacity>=9.0.0", ] diff --git a/microservices/backend/uv.lock b/microservices/backend/uv.lock index 2691baf..abcbec8 100644 --- a/microservices/backend/uv.lock +++ b/microservices/backend/uv.lock @@ -51,6 +51,7 @@ dependencies = [ { name = "pydantic", extra = ["email"] }, { name = "pydantic-settings" }, { name = "pyjwt" }, + { name = "python-multipart" }, { name = "sqlmodel" }, { name = "tenacity" }, ] @@ -72,6 +73,7 @@ requires-dist = [ { name = "pydantic", extras = ["email"], specifier = ">=2.10.3" }, { name = "pydantic-settings", specifier = ">=2.2.1,<3.0.0" }, { name = "pyjwt", specifier = ">=2.10.1" }, + { name = "python-multipart", specifier = ">=0.0.7,<1.0.0" }, { name = "sqlmodel", specifier = ">=0.0.22,<1.0.0" }, { name = "tenacity", specifier = ">=9.0.0" }, ]