chore: switch from poetry to uv

Author: monosans

.dockerignore

@@ -14,9 +14,9 @@
 !./socnet_rs/pyproject.toml
 !./socnet_rs/socnet_rs.pyi
 !./manage.py
-!./poetry.lock
 !./package-lock.json
 !./package.json
 !./pyproject.toml
 !./tsconfig.json
+!./uv.lock
 Dockerfile

.github/dependabot.yml

@@ -51,6 +51,3 @@ updates:
         update-types:
           - minor
           - patch
-    ignore:
-      - dependency-name: "django-stubs*"
-        versions: ["5.0.3", "5.0.4"]

.github/workflows/ci.yml

@@ -30,7 +30,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: pipx run pre-commit run --all-files
+      - uses: astral-sh/setup-uv@v3
+      - run: uv tool run --from pre-commit@latest --with pre-commit-uv --no-cache pre-commit run --all-files
   run-pytest-mypy:
     runs-on: ubuntu-latest
     env:

.github/workflows/update-dependencies.yml

@@ -19,15 +19,40 @@ jobs:
           - cmd: npm update --package-lock-only --lockfile-version 3
             commit-msg: Update package-lock.json
             branch: update/npm-lock
-          - cmd: pipx install 'maturin<2' && pipx run poetry lock --no-interaction
-            commit-msg: Update poetry.lock
-            branch: update/poetry-lock
-          - cmd: pipx run pre-commit autoupdate
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - run: ${{ matrix.cmd }}
+      - id: generate-token
+        uses: tibdex/github-app-token@v2
+        with:
+          app_id: ${{ secrets.APP_ID }}
+          private_key: ${{ secrets.PRIVATE_KEY }}
+      - uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          commit-message: ${{ matrix.commit-msg }}
+          branch: ${{ matrix.branch }}
+          delete-branch: true
+          sign-commits: true
+          title: ${{ matrix.commit-msg }}
+          body:
+  update-dependencies-uv:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'monosans' }}
+    strategy:
+      matrix:
+        include:
+          - cmd: uv lock --upgrade --no-cache
+            commit-msg: Update uv.lock
+            branch: update/uv-lock
+          - cmd: uv tool run --from pre-commit@latest --with pre-commit-uv --no-cache pre-commit autoupdate
             commit-msg: Update .pre-commit-config.yaml
             branch: update/pre-commit-config
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
       - run: ${{ matrix.cmd }}
       - id: generate-token
         uses: tibdex/github-app-token@v2

docker-compose.ci.yml

@@ -4,6 +4,7 @@ services:
     build:
       target: python-ci-run-stage
       args:
-        - POETRY_GROUPS=main,local
+        - EXTRA=local
     volumes:
       - .:/app
+      - /app/.venv

docker-compose.override.yml

@@ -4,15 +4,14 @@ services:
     build:
       target: python-local-run-stage
       args:
-        - POETRY_GROUPS=main,local
-        - GID=${GID:-1000}
-        - UID=${UID:-1000}
+        - EXTRA=local
     depends_on:
       - esbuild
     ports:
       - 8000:8000
     volumes:
       - .:/app
+      - /app/.venv
   postgres:
     volumes:
       - local-postgres-data:/var/lib/postgresql/data
@@ -22,15 +21,12 @@ services:
       context: .
       dockerfile: ./docker/django/Dockerfile
       target: node-watch-stage
-      args:
-        - GID=${GID:-1000}
-        - UID=${UID:-1000}
     networks:
       - esbuild
     volumes:
-      - ./socnet/static:/app/socnet/static
+      - ./socnet/static/private:/app/socnet/static/private
+      - ./socnet/static/public:/app/socnet/static/public
       - ./package.json:/app/package.json
-      - ./package-lock.json:/app/package-lock.json
       - ./tsconfig.json:/app/tsconfig.json
 networks:
   esbuild:

docker-compose.prod.yml

@@ -4,7 +4,7 @@ services:
     build:
       target: python-production-run-stage
       args:
-        - POETRY_GROUPS=main,production
+        - EXTRA=production
     depends_on:
       - redis
     networks:

docker/django/Dockerfile

@@ -3,19 +3,18 @@ FROM docker.io/node:lts-bookworm-slim AS node-base-stage
 
 WORKDIR /app
 
-COPY ./package.json ./package-lock.json ./
+COPY ./package.json ./
 
 RUN --mount=type=cache,target=/root/.npm \
+  --mount=type=bind,source=package-lock.json,target=package-lock.json \
   npm ci
 
 
 FROM node-base-stage AS node-build-stage
 
-COPY ./tsconfig.json ./tsconfig.json
-COPY ./socnet/static/private/css/ ./socnet/static/private/css/
-COPY ./socnet/static/private/js/ ./socnet/static/private/js/
-
-RUN npm run build
+RUN --mount=type=bind,source=tsconfig.json,target=tsconfig.json \
+  --mount=type=bind,source=socnet/static/private,target=socnet/static/private \
+  npm run build
 
 
 FROM node-base-stage AS node-watch-stage
@@ -25,11 +24,6 @@ RUN apt-get update \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
-ARG GID UID
-
-RUN groupmod --gid "${GID}" node \
-  && usermod --gid node --uid "${UID}" node
-
 USER node
 
 ENTRYPOINT ["tini", "--"]
@@ -40,12 +34,6 @@ CMD ["npm", "run", "watch"]
 FROM docker.io/python:3.12-slim-bookworm AS python-base-stage
 
 ENV \
-  PIP_DISABLE_PIP_VERSION_CHECK=1 \
-  PIP_NO_COLOR=1 \
-  PIP_NO_INPUT=1 \
-  PIP_PROGRESS_BAR=off \
-  PIP_ROOT_USER_ACTION=ignore \
-  PIP_UPGRADE=1 \
   PYTHONDONTWRITEBYTECODE=1 \
   PYTHONUNBUFFERED=1
 
@@ -54,32 +42,28 @@ WORKDIR /app
 
 FROM python-base-stage AS python-build-stage
 
-ENV \
-  POETRY_NO_ANSI=1 \
-  POETRY_NO_CACHE=1 \
-  POETRY_NO_INTERACTION=1
-
 RUN apt-get update \
   && apt-get install -y --no-install-recommends build-essential curl libpq-dev \
   && curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
-ENV PATH="/root/.cargo/bin:${PATH}"
-
-RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
-  pip install poetry poetry-plugin-export
+ENV \
+  PATH="/root/.cargo/bin:${PATH}" \
+  UV_COMPILE_BYTECODE=1 \
+  UV_LINK_MODE=copy
 
-COPY ./poetry.lock ./pyproject.toml ./
 COPY ./socnet_rs/ ./socnet_rs/
 
-ARG POETRY_GROUPS
+ARG EXTRA
 
-RUN --mount=type=cache,target=/app/socnet_rs/target,sharing=locked \
-  --mount=type=cache,target=/root/.cache/pip,sharing=locked \
+RUN --mount=from=ghcr.io/astral-sh/uv,source=/uv,target=/bin/uv \
+  --mount=type=cache,target=/app/socnet_rs/target,sharing=locked \
+  --mount=type=cache,target=/root/.cache/uv,sharing=locked \
   --mount=type=cache,target=/root/.cargo/registry,sharing=locked \
-  poetry export --without-hashes --only="${POETRY_GROUPS}" | \
-  pip wheel --wheel-dir /usr/src/app/wheels -r /dev/stdin
+  --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+  --mount=type=bind,source=uv.lock,target=uv.lock \
+  uv sync --extra="${EXTRA}" --no-dev --no-install-project --frozen
 
 
 FROM python-base-stage AS python-base-run-stage
@@ -96,25 +80,36 @@ RUN apt-get update \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
-COPY --from=python-build-stage /usr/src/app/wheels/ /wheels/
+COPY --from=python-build-stage /app/.venv /app/.venv
+
+ENV PATH="/app/.venv/bin:$PATH"
 
-RUN pip install --no-index --find-links /wheels/ /wheels/* \
-  && rm -rf /wheels/
+ENTRYPOINT ["tini", "--", "bash", "/app/docker/django/entrypoint.sh"]
 
-ENTRYPOINT ["tini", "--", "/app/docker/django/entrypoint.sh"]
+CMD ["bash", "/app/docker/django/start.sh"]
 
-CMD ["/app/docker/django/start.sh"]
 
+FROM python-base-run-stage AS python-local-run-stage
 
-FROM python-ci-run-stage AS python-local-run-stage
+ENV DJANGO_SETTINGS_MODULE=config.settings.local
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends gettext libpq-dev tini wait-for-it \
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/* \
+  && groupadd --gid 1000 django \
+  && useradd --gid 1000 --no-log-init --uid 1000 django
 
-ARG GID UID
+COPY --chown=django:django --from=python-build-stage /app/.venv /app/.venv
 
-RUN groupadd --gid "${GID}" --system django \
-  && useradd --gid django --no-log-init --system --uid "${UID}" django
+ENV PATH="/app/.venv/bin:$PATH"
 
 USER django
 
+ENTRYPOINT ["tini", "--", "bash", "/app/docker/django/entrypoint.sh"]
+
+CMD ["bash", "/app/docker/django/start.sh"]
+
 
 FROM python-base-run-stage AS python-production-run-stage
 
@@ -124,22 +119,21 @@ RUN apt-get update \
   && apt-get install -y --no-install-recommends brotli gettext libpq-dev tini wait-for-it \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/* \
-  && groupadd --system django \
-  && useradd --gid django --no-log-init --system django \
+  && groupadd --gid 1000 django \
+  && useradd --gid 1000 --no-log-init --uid 1000 django \
   && mkdir -p /var/www/django/static /var/www/django/media \
   && chown django:django /var/www/django/static /var/www/django/media
 
-COPY --from=python-build-stage /usr/src/app/wheels/ /wheels/
+COPY --chown=django:django --from=python-build-stage /app/.venv /app/.venv
 
-RUN pip install --no-index --find-links /wheels/ /wheels/* \
-  && rm -rf /wheels/
+ENV PATH="/app/.venv/bin:$PATH"
 
 COPY --chown=django:django . .
-COPY --from=node-build-stage /app/socnet/static/public/css/ /app/socnet/static/public/css/
-COPY --from=node-build-stage /app/socnet/static/public/js/ /app/socnet/static/public/js/
+COPY --chown=django:django --from=node-build-stage /app/socnet/static/public/css/ /app/socnet/static/public/css/
+COPY --chown=django:django --from=node-build-stage /app/socnet/static/public/js/ /app/socnet/static/public/js/
 
 USER django
 
-ENTRYPOINT ["tini", "--", "/app/docker/django/entrypoint.prod.sh"]
+ENTRYPOINT ["tini", "--", "bash", "/app/docker/django/entrypoint.prod.sh"]
 
-CMD ["/app/docker/django/start.prod.sh"]
+CMD ["bash", "/app/docker/django/start.prod.sh"]

docker/django/start.debugpy.sh

@@ -2,4 +2,4 @@
 
 set -euo pipefail
 
-exec /usr/local/bin/python3 -m debugpy --wait-for-client --listen 0.0.0.0:5678 /usr/local/bin/uvicorn --host 0.0.0.0 --reload --reload-include '*.html' --log-config config/settings/logging.json --no-server-header config.asgi:application
+exec python3 -m debugpy --wait-for-client --listen 0.0.0.0:5678 uvicorn --host 0.0.0.0 --reload --reload-include '*.html' --log-config config/settings/logging.json --no-server-header config.asgi:application

docker/django/start.prod.sh

@@ -53,4 +53,4 @@ find /var/www/django/static -type f ! \( -iname '*.br' -o -iname '*.gz' \) | whi
 	done
 done
 
-exec /usr/local/bin/gunicorn --config python:docker.django.gunicorn_config config.asgi:application
+exec gunicorn --config python:docker.django.gunicorn_config config.asgi:application