Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["3.12", "3.13", "3.14"]
version: ["3.13", "3.14", "3.15"]

env:
UV_NO_DEV: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["3.12", "3.13", "3.14"]
version: ["3.13", "3.14", "3.15"]

env:
TESTCONTAINER_DOCKER_NETWORK: kanae-testcontainers
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/astral-sh/uv:python3.14-trixie-slim AS build
FROM ghcr.io/astral-sh/uv:python3.15-trixie-slim AS build

# Compile bytecode and enable caching
# Ref: https://docs.astral.sh/uv/guides/integration/docker/#compiling-bytecode
Expand Down Expand Up @@ -31,7 +31,7 @@ COPY ./src /kanae
RUN --mount=type=cache,target=/root/.cache/uv \
uv sync --frozen

FROM python:3.14-slim-trixie
FROM python:3.15-slim-trixie

ENV PYTHONUNBUFFERED=1
ENV PYTHONPATH=/kanae
Expand Down
8 changes: 6 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "kanae"
version = "0.3.1"
description = "Internal backend server for ACM @ UC Merced"
readme = "README.md"
requires-python = ">=3.12,<4.0"
requires-python = ">=3.13,<4.0"
dependencies = [
"aiobotocore~=3.10.0",
"aiocache~=0.12.3",
Expand All @@ -20,7 +20,8 @@ dependencies = [
"pybase62~=1.0.0",
"python-dateutil==2.9.0.post0",
"pyvips[binary]~=3.2.0",
"pyyaml~=6.0.3",
"pyyaml==6.0.3; python_version < '3.15'",
"pyyaml-cp315==6.0.3; python_version >= '3.15'",
"uvloop~=0.23.0; sys_platform != 'win32'",
"valkey-glide==2.6.0",
"winloop~=0.8.0; sys_platform == 'win32'",
Expand Down Expand Up @@ -53,6 +54,9 @@ test = [
"schemathesis~=4.33.0",
]

[tool.uv]
override-dependencies = ["pyyaml==6.0.3; python_version < '3.15'"]

[tool.ty.src]
include = ["src"]
exclude = [
Expand Down
2 changes: 1 addition & 1 deletion src/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,7 @@ async def lifespan(self, app: Self) -> AsyncGenerator[None]:

yield

def get_db(self) -> Generator[asyncpg.Pool, None, None]:
def get_db(self) -> Generator[asyncpg.Pool]:
yield self.pool

def openapi(self) -> dict[str, Any]:
Expand Down
Loading
Loading