update(pyproject): use new dependencies

emptybutton · emptybutton · commit 77656de7d3fc · 2025-06-16T12:56:51.000+07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,22 +8,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: ruff
-        run: docker compose -f deployments/dev/docker-compose.yaml run backend ruff check src tests
+        run: docker compose -f deploy/dev/docker-compose.yaml run backend ruff check src tests
 
   mypy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: mypy
-        run: docker compose -f deployments/dev/docker-compose.yaml run backend mypy src tests
+        run: docker compose -f deploy/dev/docker-compose.yaml run backend mypy src tests
 
   pytest:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
       - name: pytest
-        run: docker compose -f deployments/dev/docker-compose.yaml run backend pytest tests --cov --cov-report=xml
+        run: docker compose -f deploy/dev/docker-compose.yaml run backend pytest tests --cov --cov-report=xml
 
       - name: upload coverage reports to codecov
         uses: codecov/codecov-action@v5
diff --git a/README.md b/README.md
@@ -9,5 +9,5 @@ app_name_description.
 ## Развертывание для разработки
 ```bash
 git clone https://github.com/emptybutton/app-name-kebab-case.git
-docker compose -f app-name-kebab-case/deployments/dev/docker-compose.yaml up
+docker compose -f app-name-kebab-case/deploy/dev/docker-compose.yaml up
 ```
diff --git a/deploy/dev/.env.template b/deploy/dev/.env.template
diff --git a/deploy/dev/backend/Dockerfile b/deploy/dev/backend/Dockerfile
@@ -9,4 +9,4 @@ ENV UV_CACHE_DIR /run/app/uv
 ENV PYTHONPATH /app/src:/app/tests
 ENV WATCHFILES_FORCE_POLLING true
 
-ENTRYPOINT ["bash", "deployments/dev/backend/entrypoint.sh"]
+ENTRYPOINT ["bash", "deploy/dev/backend/entrypoint.sh"]
diff --git a/deploy/dev/backend/entrypoint.sh b/deploy/dev/backend/entrypoint.sh
diff --git a/deploy/dev/docker-compose.yaml b/deploy/dev/docker-compose.yaml
@@ -4,7 +4,7 @@ services:
   backend:
     build:
       context: ../../
-      dockerfile: deployments/dev/backend/Dockerfile
+      dockerfile: deploy/dev/backend/Dockerfile
       tags:
         - "app-name-kebab-case-backend:dev"
     container_name: app-name-kebab-case-backend
@@ -19,7 +19,12 @@ services:
     environment:
       JWT_SECRET: super-secret-jwt-secret
       POSTGRES_URL: postgresql+psycopg://root:root@postgres/root
-    command: app-name-kebab-case-fastapi-dev
+    command: app-name-kebab-case-dev
+    healthcheck:
+      test: python3 -c "from urllib.request import urlopen as f; assert f('http://backend:8000/health').status == 204"
+      start_period: 2m
+      start_interval: 0.5s
+      interval: 10s
 
   postgres:
     image: postgres:16.3-alpine3.19
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,30 +10,32 @@ readme = "README.md"
 classifiers = ["Private :: Do Not Upload"]
 requires-python = "==3.13.*"
 dependencies = [
+    "dishka==1.6.0",
     "effectt==0.2.0",
-    "uvicorn[standard]==0.30.6",
-    "typenv==0.2.0",
-    "dishka==1.4.2",
-    "fastapi==0.115.2",
+    "in-memory-db==0.3.0",
+    "sqlalchemy==2.0.41",
+    "psycopg[binary]==3.2.9",
+    "alembic==1.16.1",
     "PyJWT==2.10.1",
-    "sqlalchemy==2.0.38",
-    "psycopg[binary]==3.2.5",
-    "alembic==1.14.1",
-    "in-memory-db==0.2.0",
+    "typenv==0.2.0",
+    "fastapi==0.115.12",
+    "uvicorn[standard]==0.34.3",
 ]
 
-[project.optional-dependencies]
+[dependency-groups]
 dev = [
-    "mypy[faster-cache]==1.15.0",
-    "ruff==0.9.7",
-    "pytest==8.3.4",
-    "pytest-asyncio==0.25.3",
-    "pytest-cov==6.0.0",
-    "dirty-equals==0.8.0",
-    "httpx==0.27.2",
-    "httpx-ws==0.7.0",
+    "mypy[faster-cache]==1.16.0",
+    "ruff==0.11.13",
+    "pytest==8.4.0",
+    "pytest-cov==6.1.1",
+    "pytest-asyncio==1.0.0",
+    "dirty-equals==0.9.0",
+    "httpx==0.28.1",
+    "httpx-ws==0.7.2",
 ]
-prod = []
+
+[project.urls]
+Repository = "https://github.com/emptybutton/app-name-kebab-case"
 
 [build-system]
 requires = ["hatchling"]
@@ -43,7 +45,15 @@ build-backend = "hatchling.build"
 packages = ["src/app_name_snake_case"]
 
 [project.scripts]
-app-name-kebab-case-fastapi-dev = "app_name_snake_case.main.fastapi.__main__:main"
+app-name-kebab-case-dev = "app_name_snake_case.main.fastapi.__main__:main"
+
+[tool.uv]
+add-bounds = "exact"
+
+[tool.uv.workspace]
+members = [
+    "dist",
+]
 
 [tool.mypy]
 mypy_path = "$MYPY_CONFIG_FILE_DIR/src:$MYPY_CONFIG_FILE_DIR/tests"
@@ -57,24 +67,42 @@ preview = true
 line-length = 80
 indent-width = 4
 
-[tool.ruff.lint]
-select = [
-    "ANN", "F", "W", "E", "B", "C90", "N", "UP", "YTT", "ASYNC", "PL", "RUF",
-    "Q", "RET", "SLF", "SLOT", "SIM", "TID252", "TCH", "ARG", "PTH", "ERA", "TRY",
-    "PERF", "INP", "I", "S", "FAST", "TID", "TCH", "INT"
-]
-ignore = ["N818", "RUF009", "UP018", "PLR6301", "PLR0913", "PLW0108", "TC006"]
-
 [tool.ruff.lint.isort]
 lines-after-imports = 2
 
+[tool.ruff.lint]
+select = ["ALL"]
+ignore = [
+    "EXE002",
+    "CPY001",
+    "C401",
+    "C408",
+    "D100",
+    "D101",
+    "D102",
+    "D103",
+    "D104",
+    "D105",
+    "D106",
+    "D107",
+    "D200",
+    "D201",
+    "D202",
+    "D203",
+    "D205",
+    "D401",
+    "D212",
+    "DOC201",
+    "DOC501",
+    "PLR6301",
+    "TC002",
+    "TC003",
+    "TC006",
+]
+
 [tool.ruff.lint.per-file-ignores]
-"src/app_name_snake_case/entities/*" = ["PLR2004"]
-"src/app_name_snake_case/application/*" = ["PLR0917"]
-"src/app_name_snake_case/infrastructure/adapters/*" = ["RUF029"]
-"tests/*" = ["S101", "PLR0124", "PLR0917", "S106", "C901"]
-"*/alembic/versions/*" = ["S101"]
-"__init__.py" = ["PLC0414"]
+"tests/*" = ["S101", "PT013", "PLR2004", "D400", "D415"]
+"tests/test_tgdb/test_entities/test_horizon.py" = ["D400", "D415"]
 
 [tool.pytest.ini_options]
 pythonpath = ["src"]
diff --git a/src/app_name_snake_case/application/ports/user_id_signing.py b/src/app_name_snake_case/application/ports/user_id_signing.py
@@ -9,5 +9,5 @@ async def signed_user_id(self, user_id: UUID, /) -> SignedUserIDT:
 
     @abstractmethod
     async def user_id(
-        self, signed_user_id: SignedUserIDT, /
+        self, signed_user_id: SignedUserIDT, /,
     ) -> UUID | None: ...
diff --git a/src/app_name_snake_case/application/ports/user_views.py b/src/app_name_snake_case/application/ports/user_views.py
@@ -10,6 +10,6 @@ async def view_of_user(self, user: User, /) -> UserViewT: ...
 
     @abstractmethod
     async def view_of_user_with_id(
-        self, user_id: UUID | None, /
+        self, user_id: UUID | None, /,
     ) -> UserWithIDViewT:
         ...
diff --git a/src/app_name_snake_case/application/ports/users.py b/src/app_name_snake_case/application/ports/users.py
@@ -6,4 +6,4 @@
 
 class Users(ABC):
     @abstractmethod
-    async def user_with_id(self, id: UUID) -> User | None: ...
+    async def user_with_id(self, id_: UUID, /) -> User | None: ...
diff --git a/src/app_name_snake_case/application/register_user.py b/src/app_name_snake_case/application/register_user.py
@@ -38,7 +38,7 @@ class RegisterUser[SignedUserIDT, UserViewT, UserViewWithIDT]:
     user_views: UserViews[UserViewT, UserViewWithIDT]
 
     async def __call__(
-        self, signed_user_id: SignedUserIDT | None, user_name: str
+        self, signed_user_id: SignedUserIDT | None, user_name: str,
     ) -> Output[SignedUserIDT, UserViewT]:
         """
         :raises app_name_snake_case.application.register_user.RegisteredUserToRegisterUserError:
@@ -62,6 +62,6 @@ async def __call__(
             view = await self.user_views.view_of_user(just(registered_user_))
 
         signed_user_id = await self.user_id_signing.signed_user_id(
-            just(registered_user_).id
+            just(registered_user_).id,
         )
         return Output(signed_user_id=signed_user_id, user_view=view)
diff --git a/src/app_name_snake_case/application/view_user.py b/src/app_name_snake_case/application/view_user.py
@@ -12,7 +12,7 @@ class ViewUser[SignedUserIDT, UserViewT, UserViewWithIDT]:
     transaction: Transaction
 
     async def __call__(
-        self, signed_user_id: SignedUserIDT | None
+        self, signed_user_id: SignedUserIDT | None,
     ) -> UserViewWithIDT:
         if signed_user_id is None:
             user_id = None
diff --git a/src/app_name_snake_case/entities/time/time.py b/src/app_name_snake_case/entities/time/time.py
@@ -25,5 +25,5 @@ def __gt__(self, time: "Time") -> bool:
     def __ge__(self, time: "Time") -> bool:
         return self.datetime >= time.datetime
 
-    def map(self, next: Callable[[datetime_cls], datetime_cls]) -> "Time":
-        return Time(datetime=next(self.datetime))
+    def map(self, next_: Callable[[datetime_cls], datetime_cls]) -> "Time":
+        return Time(datetime=next_(self.datetime))
diff --git a/src/app_name_snake_case/infrastructure/adapters/transaction.py b/src/app_name_snake_case/infrastructure/adapters/transaction.py
@@ -12,8 +12,8 @@ async def in_postgres_transaction(session: AsyncSession) -> AsyncIterator[None]:
 
 
 @asynccontextmanager
-async def in_memory_transaction(
-    dbs: Sequence[InMemoryDb]
+async def in_memory_transaction(  # noqa: RUF029
+    dbs: Sequence[InMemoryDb],
 ) -> AsyncIterator[None]:
     for db in dbs:
         db.begin()
diff --git a/src/app_name_snake_case/infrastructure/adapters/users.py b/src/app_name_snake_case/infrastructure/adapters/users.py
@@ -13,13 +13,13 @@
 class InMemoryUsers(Users):
     db: InMemoryDb
 
-    async def user_with_id(self, id: UUID) -> User | None:
-        return self.db.subset(User).select_one(lambda user: user.id == id)
+    async def user_with_id(self, id_: UUID) -> User | None:
+        return self.db.subset(User).select_one(lambda user: user.id == id_)
 
 
 @dataclass(frozen=True)
 class InPostgresUsers(Users):
     session: AsyncSession
 
-    async def user_with_id(self, id: UUID) -> User | None:
-        return await self.session.get(User, id)
+    async def user_with_id(self, id_: UUID) -> User | None:
+        return await self.session.get(User, id_)
diff --git a/src/app_name_snake_case/infrastructure/alembic/env.py b/src/app_name_snake_case/infrastructure/alembic/env.py
@@ -20,7 +20,8 @@
 
 
 def run_migrations_offline() -> None:
-    """Run migrations in 'offline' mode.
+    """
+    Run migrations in 'offline' mode.
 
     This configures the context with just a URL
     and not an Engine, though an Engine is acceptable
@@ -44,7 +45,8 @@ def run_migrations_offline() -> None:
 
 
 def run_migrations_online() -> None:
-    """Run migrations in 'online' mode.
+    """
+    Run migrations in 'online' mode.
 
     In this scenario we need to create an Engine
     and associate a connection with the context.
@@ -58,7 +60,7 @@ def run_migrations_online() -> None:
 
     with connectable.connect() as connection:
         context.configure(
-            connection=connection, target_metadata=target_metadata
+            connection=connection, target_metadata=target_metadata,
         )
 
         with context.begin_transaction():
diff --git a/src/app_name_snake_case/infrastructure/alembic/versions/e78dd190868f_add_user_table.py b/src/app_name_snake_case/infrastructure/alembic/versions/e78dd190868f_add_user_table.py
@@ -1,4 +1,5 @@
-"""add user table
+"""
+add user table.
 
 Revision ID: e78dd190868f
 Revises:
@@ -24,7 +25,7 @@ def upgrade() -> None:
     sa.Column("name", sa.String(), nullable=False),
     sa.PrimaryKeyConstraint("id"),
     sa.UniqueConstraint("name"),
-    sa.UniqueConstraint("name", name="users_name_unique")
+    sa.UniqueConstraint("name", name="users_name_unique"),
     )
     # ### end Alembic commands ###
 
diff --git a/src/app_name_snake_case/infrastructure/sqlalchemy/__init__.py b/src/app_name_snake_case/infrastructure/sqlalchemy/__init__.py
@@ -1,2 +1,4 @@
-from app_name_snake_case.infrastructure.sqlalchemy import orm as orm
-from app_name_snake_case.infrastructure.sqlalchemy import tables as tables
+from app_name_snake_case.infrastructure.sqlalchemy import orm, tables
+
+
+__all__ = ("orm", "tables")
diff --git a/src/app_name_snake_case/main/common/asgi.py b/src/app_name_snake_case/main/common/asgi.py
@@ -17,7 +17,7 @@ class LazyASGIApp:
     __app: ASGIApp | None = field(default=None, init=False)
 
     async def __call__(
-        self, scope: Scope, receive: Receive, send: Send
+        self, scope: Scope, receive: Receive, send: Send,
     ) -> None:
         if self.__app is None:
             self.__app = await self.app_factory()
diff --git a/src/app_name_snake_case/main/common/di.py b/src/app_name_snake_case/main/common/di.py
@@ -43,7 +43,7 @@ async def provide_postgres_engine(self, envs: Envs) -> AsyncEngine:
 
     @provide(scope=Scope.REQUEST)
     async def provide_postgres_session(
-        self, engine: AsyncEngine
+        self, engine: AsyncEngine,
     ) -> AsyncIterator[AsyncSession]:
         session = AsyncSession(
             engine,
@@ -57,13 +57,13 @@ async def provide_postgres_session(
 
     @provide(scope=Scope.APP)
     def provide_user_id_signing(
-        self, envs: Envs
+        self, envs: Envs,
     ) -> AnyOf[UserIDSigningToHS256JWT, UserIDSigning[JWT]]:
         return UserIDSigningToHS256JWT(secret=envs.jwt_secret)
 
     @provide(scope=Scope.REQUEST)
     def provide_users(
-        self, session: AsyncSession
+        self, session: AsyncSession,
     ) -> AnyOf[InPostgresUsers, Users]:
         return InPostgresUsers(session=session)
 
@@ -81,22 +81,22 @@ def provide_users(
 
     @provide(scope=Scope.REQUEST)
     def provide_transaction(
-        self, session: AsyncSession
+        self, session: AsyncSession,
     ) -> Transaction:
         return in_postgres_transaction(session=session)
 
     provide_user_views = provide(
         UserSchemasFromPostgres,
         provides=AnyOf[
-            UserViews[UserSchema, UserSchema | None], UserSchemasFromPostgres
+            UserViews[UserSchema, UserSchema | None], UserSchemasFromPostgres,
         ],
         scope=Scope.REQUEST,
     )
 
     provide_register_user = provide(
         RegisterUser[JWT, UserSchema, UserSchema | None],
         provides=RegisterUser[str, UserSchema, UserSchema | None],
-        scope=Scope.REQUEST
+        scope=Scope.REQUEST,
     )
     provide_view_user = provide(
         ViewUser[JWT, UserSchema, UserSchema | None],
diff --git a/src/app_name_snake_case/presentation/adapters/user_views.py b/src/app_name_snake_case/presentation/adapters/user_views.py
@@ -18,13 +18,13 @@ async def view_of_user(self, user: User, /) -> UserSchema:
         return UserSchema(name=user.name)
 
     async def view_of_user_with_id(
-        self, user_id: UUID | None, /
+        self, user_id: UUID | None, /,
     ) -> UserSchema | None:
         if user_id is None:
             return None
 
         user_name: str | None = await self.session.scalar(
-            select(user_table.c.name).where(user_table.c.id == user_id)
+            select(user_table.c.name).where(user_table.c.id == user_id),
         )
         if user_name is None:
             return None
diff --git a/src/app_name_snake_case/presentation/fastapi/cookies.py b/src/app_name_snake_case/presentation/fastapi/cookies.py
diff --git a/src/app_name_snake_case/presentation/fastapi/routes/register_user.py b/src/app_name_snake_case/presentation/fastapi/routes/register_user.py
diff --git a/tests/test_app_name_snake_case/test_infrastructure/conftest.py b/tests/test_app_name_snake_case/test_infrastructure/conftest.py
diff --git a/tests/test_app_name_snake_case/test_main/test_fastapi/test_routes/test_healthcheck.py b/tests/test_app_name_snake_case/test_main/test_fastapi/test_routes/test_healthcheck.py
diff --git a/tests/test_app_name_snake_case/test_presentation/test_fastapi/test_app.py b/tests/test_app_name_snake_case/test_presentation/test_fastapi/test_app.py
diff --git a/uv.lock b/uv.lock
