Update Dockerfile and test, bump to 3.14

- Remove healthcheck; not needed and slow
- Separate service startup
- Do not check out repo, work from current directory
- Move dev packages to dependency-groups
- Add Python 3.14
- Upgrade pydantic to be compatible with 3.14

Author: marcgibbons

.github/workflows/main.yml

@@ -9,31 +9,36 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
       - name: create project
         run: |
-          pip install django
-          django-admin startproject \
+          uv run --with django django-admin startproject \
            --template="https://github.com/lincolnloop/django-layout/zipball/$GITHUB_REF_NAME" \
            --extension=py,md,gitignore,yaml,json,toml \
            --name=Makefile,Dockerfile \
            --exclude=.github \
-           testproj
+           testproj .
+
       - name: mock client build
         run: |
           mkdir -p client/dist
           touch client/dist/index.js
-        working-directory: testproj
+
+      - name: build container
+        run: docker compose build
+
       - name: start services
-        run: |
-          docker compose up -d
-          # wait for migrations to finish
-          docker attach $(docker compose ps -q django-migrate)
+        run: docker compose up -d db client
+
+      - name: run migrations
+        run:  docker compose run app python manage.py migrate --no-input
+
+      - name: start django
+        run: docker compose up -d app
         timeout-minutes: 5
-        working-directory: testproj
+
       - name: verify services running
         run: |
           docker ps  # show service status for debugging
@@ -46,20 +51,15 @@ jobs:
           curl -I --retry 10 --retry-all-errors --fail localhost:8000/static/index.js
       - name: run tests
         run: docker compose run --rm app make test
-        working-directory: testproj
       - name: verify README.md
         run: docker compose run --rm --no-deps app cog --check README.md
-        working-directory: testproj
       - name: lint code
         run: docker compose run --rm --no-deps app make lint
-        working-directory: testproj
       - name: format code
         run: docker compose run --rm --no-deps app ruff format --check .
-        working-directory: testproj
       - name: dump docker logs
         run: |
           set -x
           docker compose ps
           docker compose logs
-        working-directory: testproj
         if: always()

Dockerfile

@@ -4,24 +4,28 @@ FROM node:20-alpine AS build-node
 WORKDIR /home/node/app/client
 COPY client/package-lock.json client/package.json ./
 RUN --mount=type=cache,target=/home/node/.npm \
-    set -ex && npm install -g npm@latest && npm ci
+  set -ex && npm install -g npm@latest && npm ci
 COPY client/ ./
 RUN npm run build
 
 
 # STAGE 2: BUILD PYTHON
-FROM python:3.12-bullseye AS build-python
+FROM python:3.14 as build-python
 WORKDIR /app
-RUN set -ex && pip install --root-user-action=ignore --no-cache-dir uv && uv venv
 
+COPY --from=ghcr.io/astral-sh/uv:0.9.7 /uv /uvx /bin/
+ENV PYTHONPYCACHEPREFIX=/tmp/pycache
+ENV PYTHONUNBUFFERED=1
+ENV UV_COMPILE_BYTECODE=1
+ENV UV_LINK_MODE=copy
 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8 \
-    PATH=/app/.venv/bin:${PATH}
+  PATH=/app/.venv/bin:${PATH}
 
-# A blank string installs all extras. A non-existent extra will be ignored.
-ARG UV_EXTRA_DEPENDENCIES="null"
-COPY pyproject.toml uv.lock ./
-RUN --mount=type=cache,target=/root/.cache \
-    uv sync --frozen --extra="${UV_EXTRA_DEPENDENCIES}"
+
+RUN --mount=type=cache,target=/root/.cache/uv \
+  --mount=type=bind,source=uv.lock,target=uv.lock \
+  --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+  uv sync --locked
 
 COPY . ./
 COPY --from=build-node /home/node/app/client/dist ./client/dist

compose.yaml

@@ -1,5 +1,4 @@
 services:
-
   client:
     build:
       context: .
@@ -16,11 +15,6 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data/
       - .data/db_dumps:/db_dumps
-    healthcheck:
-      test: pg_isready -U postgres -d {{ project_name }}
-      interval: 5s
-      timeout: 10s
-      retries: 120
     environment:
       - POSTGRES_DB={{ project_name }}
       - POSTGRES_PASSWORD=postgres
@@ -39,8 +33,7 @@ services:
         - SECRET_KEY=not-secret
       restart: on-failure
       depends_on:
-        db:
-          condition: service_healthy
+        - db
     command: python manage.py runserver 0.0.0.0:8000
     ports:
       - ${PORT:-8000}:8000
@@ -52,14 +45,6 @@ services:
       - /app/{{ project_name }}.egg-info
       - client:/app/client/dist
 
-  django-migrate:
-    <<: *COMMON
-    command: python manage.py migrate --noinput
-    volumes:
-      - .:/app
-      - /app/.venv
-      - /app/{{ project_name }}.egg-info
-
 volumes:
   client:
   pgdata:

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "django-layout"
 version = "4.0"
-requires-python = ">=3.12"
+requires-python = "==3.14.0"
 dependencies = [
   "django==5.1.*",
   "dj-database-url",
@@ -20,7 +20,7 @@ dependencies = [
   "wsgi-basic-auth",
 ]
 
-[project.optional-dependencies]
+[dependency-groups]
 dev = [
   "cogapp",
   "django-stubs",

renovate.json

@@ -1,6 +1,8 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["helpers:pinGitHubActionDigests"],
+  "extends": [
+    "helpers:pinGitHubActionDigests"
+  ],
   "automerge": true,
   "automergeType": "pr",
   "lockFileMaintenance": {
@@ -15,11 +17,4 @@
     "enabled": true
   },
   "rangeStrategy": "pin",
-  "packageRules": [
-    {
-      "matchManagers": ["pep621"],
-      "matchDepNames": ["python"],
-      "enabled": false
-    }
-  ]
 }