Use uv instead of poetry (#18)

Author: piotrekkr

.devcontainer/devcontainer.json

@@ -1,6 +1,5 @@
 *
 !src/
-!test/
-!poetry.lock
+!uv.lock
 !pyproject.toml
 !README.md

.dockerignore

@@ -14,8 +14,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  quality-assurance:
-    name: Check Code Quality
+  image-build:
+    name: Check Image Build
     timeout-minutes: 10
     runs-on: ubuntu-22.04
     env:
@@ -39,10 +39,8 @@ jobs:
 
       - name: Build image
         uses: docker/build-push-action@v5
-        id: build-and-push
         with:
           context: .
-          target: ci
           build-args: |
             ARCHIVIST_UID=${{ steps.user-id.outputs.gha_uid }}
             ARCHIVIST_GID=${{ steps.user-id.outputs.gha_gid }}
@@ -51,16 +49,33 @@ jobs:
           tags: ${{ env.CI_IMAGE_TAG }}
           cache-from: type=gha,scope=archivist
           cache-to: type=gha,mode=max,scope=archivist
-          load: true
+          load: false
+
+  code-quality:
+    name: Check Code Quality
+    timeout-minutes: 10
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          show-progress: false
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Install dev and test dependencies
+        run: uv sync
 
       - name: Check code formatting
-        run: docker run ${{ env.CI_IMAGE_TAG }} poe format-check
+        run: uv run poe format-check
 
       - name: Check linting
-        run: docker run ${{ env.CI_IMAGE_TAG }} poe lint-check
+        run: uv run poe lint-check
 
       - name: Run static analysis
-        run: docker run ${{ env.CI_IMAGE_TAG }} poe mypy
+        run: uv run poe mypy
 
       - name: Run tests
-        run: docker run ${{ env.CI_IMAGE_TAG }} poe test
+        run: uv run poe test

.github/workflows/quality-assurance.yaml

@@ -60,7 +60,6 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64
           context: .
-          target: prod
           file: Dockerfile
           push: true
           tags: ${{ steps.params.outputs.tags }}

.github/workflows/release.yaml

@@ -1,103 +1,41 @@
 # syntax=docker/dockerfile:1
 
-FROM python:3.11-slim-bookworm as base
+FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim@sha256:74b8fe8ec5931f3930cfb6c87b46aeb1dbd497a609f6abf860fd0f4390f8b040
 
-ARG DEBIAN_FRONTEND=noninteractive
+WORKDIR /archivist
 
-ENV PYTHONFAULTHANDLER=1 \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    PYTHONHASHSEED=random \
-    PIP_NO_CACHE_DIR=off \
-    PIP_DISABLE_PIP_VERSION_CHECK=on \
-    PIP_DEFAULT_TIMEOUT=100
+# Enable bytecode compilation
+ENV UV_COMPILE_BYTECODE=1
 
-WORKDIR /archivist
+# Copy from the cache instead of linking since it's a mounted volume
+ENV UV_LINK_MODE=copy
 
 # fetch container running user from build args
 ARG ARCHIVIST_UID=1000
 ARG ARCHIVIST_GID=1000
 
 RUN <<EOF
-    apt-get update
-    apt-get install --no-install-recommends --yes curl git
     # add archivist user that will be used to run container by default
     groupadd --gid $ARCHIVIST_GID archivist
     useradd --create-home --gid $ARCHIVIST_GID --uid $ARCHIVIST_UID archivist --no-log-init
-    # make archivist and owner of /opt/venv so it can write to it
-    mkdir -p /opt/venv
-    chown -R archivist:archivist /opt/venv /archivist
-EOF
-
-ENV POETRY_VERSION=1.7.1 \
-    POETRY_VIRTUAL_ENV=/opt/venv/poetry
-
-RUN --mount=type=cache,target=/root/.cache/pip/ <<EOF
-    # create virtual env for poetry
-    python -m venv $POETRY_VIRTUAL_ENV
-    # install poetry
-    $POETRY_VIRTUAL_ENV/bin/pip install poetry~=$POETRY_VERSION
-    # make poetry available system wide
-    ln -s $POETRY_VIRTUAL_ENV/bin/poetry /usr/local/bin/poetry
+    chown -R archivist:archivist /archivist
 EOF
 
 USER archivist
 
-# set archivist virtual env path and update PATH to register virtual env binaries
-# this will ensure poetry will usie archivist virtual env when installing packages
-ENV VIRTUAL_ENV=/opt/venv/archivist
-ENV PATH=$VIRTUAL_ENV/bin:$PATH
-
-# create actual virtual env
-RUN python -m venv $VIRTUAL_ENV
-
-COPY --chown=archivist:archivist poetry.lock pyproject.toml ./
-
-# install non dev dependencies
-RUN --mount=type=cache,uid=$ARCHIVIST_UID,gid=$ARCHIVIST_GID,target=/home/archivist/.cache/pypoetry/ \
-    poetry install --without dev --no-interaction --no-ansi --no-root --sync
+# Install the project's dependencies using the lockfile and settings
+RUN --mount=type=cache,uid=$ARCHIVIST_UID,gid=$ARCHIVIST_GID,target=/home/archivist/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    uv sync --locked --no-install-project --no-dev
 
 COPY --chown=archivist:archivist . .
 
-##############################
-# Production
-##############################
-FROM base as prod
+RUN --mount=type=cache,uid=$ARCHIVIST_UID,gid=$ARCHIVIST_GID,target=/home/archivist/.cache/uv \
+    uv sync --locked --no-dev
 
-# install app as binary
-RUN --mount=type=cache,uid=$ARCHIVIST_UID,gid=$ARCHIVIST_GID,target=/home/archivist/.cache/pypoetry/ \
-    poetry install --without dev --no-interaction --no-ansi --sync
+ENV PATH="/archivist/.venv/bin:$PATH"
 
 ENTRYPOINT ["archivist"]
 
 CMD ["--help"]
-
-
-##############################
-# CI
-##############################
-FROM base as ci
-
-# install additional dev dependencies
-RUN --mount=type=cache,uid=$ARCHIVIST_UID,gid=$ARCHIVIST_GID,target=/home/archivist/.cache/pypoetry/ \
-    poetry install --no-interaction --no-ansi --sync
-
-
-
-##############################
-# Development
-##############################
-FROM ci as dev
-
-USER root
-
-# Install development tools
-RUN <<EOF
-    apt-get update
-    apt-get install --no-install-recommends --yes git curl gnupg ssh sudo vim
-    usermod --shell /usr/bin/bash archivist
-    echo 'archivist ALL=(root) NOPASSWD:ALL' > /etc/sudoers.d/archivist
-    chmod 0440 /etc/sudoers.d/archivist
-EOF
-
-USER archivist