build: upgrade scaffolding

Author: lsorber

.copier-answers.yml

@@ -0,0 +1,12 @@
+_commit: v1.5.0
+_src_path: gh:superlinear-ai/substrate
+author_email: laurent@superlinear.eu
+author_name: Laurent Sorber
+project_description: wtpsplit with minimal dependencies
+project_name: wtpsplit-lite
+project_type: package
+project_url: https://github.com/superlinear-ai/wtpsplit-lite
+python_version: '3.10'
+typing: strict
+with_conventional_commits: true
+with_typer_cli: false

.cruft.json

@@ -3,10 +3,19 @@
     "dockerComposeFile": "../docker-compose.yml",
     "service": "devcontainer",
     "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}/",
-    "remoteUser": "user",
+    "features": {
+        "ghcr.io/devcontainers-extra/features/starship:1": {}
+    },
     "overrideCommand": true,
-    "postStartCommand": "cp --update /opt/build/poetry/poetry.lock /workspaces/${localWorkspaceFolderBasename}/ && mkdir -p /workspaces/${localWorkspaceFolderBasename}/.git/hooks/ && cp --update /opt/build/git/* /workspaces/${localWorkspaceFolderBasename}/.git/hooks/",
+    "remoteUser": "user",
+    "postStartCommand": "sudo chown -R user:user /opt/ && uv sync --python ${localEnv:PYTHON_VERSION:3.10} --resolution ${localEnv:RESOLUTION_STRATEGY:highest} --all-extras && pre-commit install --install-hooks",
     "customizations": {
+        "jetbrains": {
+            "backend": "PyCharm",
+            "plugins": [
+                "com.github.copilot"
+            ]
+        },
         "vscode": {
             "extensions": [
                 "charliermarsh.ruff",
@@ -41,25 +50,30 @@
                     100
                 ],
                 "files.autoSave": "onFocusChange",
+                "github.copilot.chat.agent.enabled": true,
+                "github.copilot.chat.edits.codesearch.enabled": true,
                 "github.copilot.chat.edits.enabled": true,
-                "jupyter.kernels.excludePythonEnvironments": ["/usr/local/bin/python"],
+                "github.copilot.nextEditSuggestions.enabled": true,
+                "jupyter.kernels.excludePythonEnvironments": [
+                    "/usr/local/bin/python"
+                ],
                 "mypy-type-checker.importStrategy": "fromEnvironment",
                 "mypy-type-checker.preferDaemon": true,
                 "notebook.codeActionsOnSave": {
                     "notebook.source.fixAll": "explicit",
                     "notebook.source.organizeImports": "explicit"
                 },
                 "notebook.formatOnSave.enabled": true,
-                "python.defaultInterpreterPath": "/opt/wtpsplit-lite-env/bin/python",
+                "python.defaultInterpreterPath": "/opt/venv/bin/python",
                 "python.terminal.activateEnvironment": false,
                 "python.testing.pytestEnabled": true,
                 "ruff.importStrategy": "fromEnvironment",
                 "ruff.logLevel": "warning",
-                "terminal.integrated.defaultProfile.linux": "zsh",
-                "terminal.integrated.profiles.linux": {
-                    "zsh": {
-                        "path": "/usr/bin/zsh"
-                    }
+                "terminal.integrated.env.linux": {
+                    "GIT_EDITOR": "code --wait"
+                },
+                "terminal.integrated.env.mac": {
+                    "GIT_EDITOR": "code --wait"
                 }
             }
         }

.devcontainer/devcontainer.json

@@ -3,3 +3,6 @@
 
 # Git
 .git/
+
+# Python
+.venv/

.dockerignore

@@ -8,20 +8,18 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-
-      - name: Install Poetry
-        run: pip install --no-input poetry
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
 
       - name: Publish package
         run: |
-          poetry config pypi-token.pypi "${{ secrets.POETRY_PYPI_TOKEN_PYPI }}"
-          poetry publish --build
+          uv build
+          uv publish

.github/workflows/publish.yml

@@ -14,9 +14,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.10", "3.12"]
+        resolution-strategy: ["highest", "lowest-direct"]
 
-    name: Python ${{ matrix.python-version }}
+    name: Python ${{ matrix.python-version }} (resolution=${{ matrix.resolution-strategy }})
 
     steps:
       - name: Checkout
@@ -28,20 +29,18 @@ jobs:
           node-version: 23
 
       - name: Install @devcontainers/cli
-        run: npm install --location=global @devcontainers/cli@0.72.0
+        run: npm install --location=global @devcontainers/cli@0.73.0
 
       - name: Start Dev Container
         run: |
           git config --global init.defaultBranch main
-          PYTHON_VERSION=${{ matrix.python-version }} devcontainer up --workspace-folder .
+          devcontainer up --workspace-folder .
+        env:
+          PYTHON_VERSION: ${{ matrix.python-version }}
+          RESOLUTION_STRATEGY: ${{ matrix.resolution-strategy }}
 
       - name: Lint package
         run: devcontainer exec --workspace-folder . poe lint
 
       - name: Test package
         run: devcontainer exec --workspace-folder . poe test
-
-      - name: Upload coverage
-        uses: codecov/codecov-action@v5
-        with:
-          files: reports/coverage.xml

.github/workflows/test.yml

@@ -2,7 +2,7 @@
 htmlcov/
 reports/
 
-# cruft
+# Copier
 *.rej
 
 # Data
@@ -30,17 +30,16 @@ notebooks/
 # macOS
 .DS_Store
 
+# mise
+mise.local.toml
+
 # mypy
 .dmypy.json
 .mypy_cache/
 
 # Node.js
 node_modules/
 
-# Poetry
-.venv/
-dist/
-
 # PyCharm
 .idea/
 
@@ -52,13 +51,19 @@ dist/
 
 # Python
 __pycache__/
+*.egg-info/
 *.py[cdo]
+.venv/
+dist/
 
 # Ruff
 .ruff_cache/
 
 # Terraform
 .terraform/
 
+# uv
+uv.lock
+
 # VS Code
 .vscode/

.gitignore

@@ -16,13 +16,14 @@ repos:
       - id: rst-inline-touching-normal
       - id: text-unicode-replacement-char
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
       - id: check-builtin-literals
       - id: check-case-conflict
       - id: check-docstring-first
+      - id: check-illegal-windows-names
       - id: check-json
       - id: check-merge-conflict
       - id: check-shebang-scripts-are-executable
@@ -65,17 +66,6 @@ repos:
         require_serial: true
         language: system
         types_or: [python, pyi]
-      - id: shellcheck
-        name: shellcheck
-        entry: shellcheck
-        args: [--check-sourced]
-        language: system
-        types: [shell]
-      - id: poetry-check
-        name: poetry check
-        entry: poetry check
-        language: system
-        pass_filenames: false
       - id: mypy
         name: mypy
         entry: mypy

.pre-commit-config.yaml

@@ -1,101 +1,29 @@
 # syntax=docker/dockerfile:1
-ARG PYTHON_VERSION=3.10
-FROM python:$PYTHON_VERSION-slim AS base
+FROM ghcr.io/astral-sh/uv:python3.10-bookworm AS dev
 
-# Remove docker-clean so we can keep the apt cache in Docker build cache.
-RUN rm /etc/apt/apt.conf.d/docker-clean
+# Create and activate a virtual environment [1].
+# [1] https://docs.astral.sh/uv/concepts/projects/config/#project-environment-path
+ENV VIRTUAL_ENV=/opt/venv
+ENV PATH=$VIRTUAL_ENV/bin:$PATH
+ENV UV_PROJECT_ENVIRONMENT=$VIRTUAL_ENV
 
-# Configure Python to print tracebacks on crash [1], and to not buffer stdout and stderr [2].
-# [1] https://docs.python.org/3/using/cmdline.html#envvar-PYTHONFAULTHANDLER
-# [2] https://docs.python.org/3/using/cmdline.html#envvar-PYTHONUNBUFFERED
-ENV PYTHONFAULTHANDLER 1
-ENV PYTHONUNBUFFERED 1
+# Tell Git that the workspace is safe to avoid 'detected dubious ownership in repository' warnings.
+RUN git config --system --add safe.directory '*'
 
-# Create a non-root user and switch to it [1].
+# Create a non-root user and give it passwordless sudo access [1].
 # [1] https://code.visualstudio.com/remote/advancedcontainers/add-nonroot-user
-ARG UID=1000
-ARG GID=$UID
-RUN groupadd --gid $GID user && \
-    useradd --create-home --gid $GID --uid $UID user --no-log-init && \
-    chown user /opt/
-USER user
-
-# Create and activate a virtual environment.
-ENV VIRTUAL_ENV /opt/wtpsplit-lite-env
-ENV PATH $VIRTUAL_ENV/bin:$PATH
-RUN python -m venv $VIRTUAL_ENV
-
-# Set the working directory.
-WORKDIR /workspaces/wtpsplit-lite/
-
-
-
-FROM base AS poetry
-
-USER root
-
-# Install Poetry in separate venv so it doesn't pollute the main venv.
-ENV POETRY_VERSION 1.8.0
-ENV POETRY_VIRTUAL_ENV /opt/poetry-env
-RUN --mount=type=cache,target=/root/.cache/pip/ \
-    python -m venv $POETRY_VIRTUAL_ENV && \
-    $POETRY_VIRTUAL_ENV/bin/pip install poetry~=$POETRY_VERSION && \
-    ln -s $POETRY_VIRTUAL_ENV/bin/poetry /usr/local/bin/poetry
-
-# Install compilers that may be required for certain packages or platforms.
-RUN --mount=type=cache,target=/var/cache/apt/ \
-    --mount=type=cache,target=/var/lib/apt/ \
-    apt-get update && \
-    apt-get install --no-install-recommends --yes build-essential
-
-USER user
-
-# Install the run time Python dependencies in the virtual environment.
-COPY --chown=user:user poetry.lock* pyproject.toml /workspaces/wtpsplit-lite/
-RUN mkdir -p /home/user/.cache/pypoetry/ && mkdir -p /home/user/.config/pypoetry/ && \
-    mkdir -p src/wtpsplit_lite/ && touch src/wtpsplit_lite/__init__.py && touch README.md
-RUN --mount=type=cache,uid=$UID,gid=$GID,target=/home/user/.cache/pypoetry/ \
-    poetry install --only main --all-extras --no-interaction
-
-
-
-FROM poetry AS dev
-
-# Install development tools: curl, git, gpg, ssh, starship, sudo, vim, and zsh.
-USER root
 RUN --mount=type=cache,target=/var/cache/apt/ \
     --mount=type=cache,target=/var/lib/apt/ \
-    apt-get update && \
-    apt-get install --no-install-recommends --yes curl git gnupg ssh sudo vim zsh && \
-    sh -c "$(curl -fsSL https://starship.rs/install.sh)" -- "--yes" && \
-    usermod --shell /usr/bin/zsh user && \
+    groupadd --gid 1000 user && \
+    useradd --create-home --no-log-init --gid 1000 --uid 1000 --shell /usr/bin/bash user && \
+    chown user:user /opt/ && \
+    apt-get update && apt-get install --no-install-recommends --yes sudo && \
     echo 'user ALL=(root) NOPASSWD:ALL' > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
-RUN git config --system --add safe.directory '*'
 USER user
 
-# Install the development Python dependencies in the virtual environment.
-RUN --mount=type=cache,uid=$UID,gid=$GID,target=/home/user/.cache/pypoetry/ \
-    poetry install --all-extras --no-interaction
-
-# Persist output generated during docker build so that we can restore it in the dev container.
-COPY --chown=user:user .pre-commit-config.yaml /workspaces/wtpsplit-lite/
-RUN mkdir -p /opt/build/poetry/ && cp poetry.lock /opt/build/poetry/ && \
-    git init && pre-commit install --install-hooks && \
-    mkdir -p /opt/build/git/ && cp .git/hooks/commit-msg .git/hooks/pre-commit /opt/build/git/
-
 # Configure the non-root user's shell.
-ENV ANTIDOTE_VERSION 1.8.6
-RUN git clone --branch v$ANTIDOTE_VERSION --depth=1 https://github.com/mattmc3/antidote.git ~/.antidote/ && \
-    echo 'zsh-users/zsh-syntax-highlighting' >> ~/.zsh_plugins.txt && \
-    echo 'zsh-users/zsh-autosuggestions' >> ~/.zsh_plugins.txt && \
-    echo 'source ~/.antidote/antidote.zsh' >> ~/.zshrc && \
-    echo 'antidote load' >> ~/.zshrc && \
-    echo 'eval "$(starship init zsh)"' >> ~/.zshrc && \
-    echo 'HISTFILE=~/.history/.zsh_history' >> ~/.zshrc && \
-    echo 'HISTSIZE=1000' >> ~/.zshrc && \
-    echo 'SAVEHIST=1000' >> ~/.zshrc && \
-    echo 'setopt share_history' >> ~/.zshrc && \
-    echo 'bindkey "^[[A" history-beginning-search-backward' >> ~/.zshrc && \
-    echo 'bindkey "^[[B" history-beginning-search-forward' >> ~/.zshrc && \
-    mkdir ~/.history/ && \
-    zsh -c 'source ~/.zshrc'
+RUN mkdir ~/.history/ && \
+    echo 'HISTFILE=~/.history/.bash_history' >> ~/.bashrc && \
+    echo 'bind "\"\e[A\": history-search-backward"' >> ~/.bashrc && \
+    echo 'bind "\"\e[B\": history-search-forward"' >> ~/.bashrc && \
+    echo 'eval "$(starship init bash)"' >> ~/.bashrc