From 69181fd19642fc20cc858396084b5ad864639e1e Mon Sep 17 00:00:00 2001 From: Alc-Alc <45509143+Alc-Alc@users.noreply.github.com> Date: Fri, 29 Nov 2024 16:38:40 +0530 Subject: [PATCH] fix(devcontainers): Replace PDM with UV (#3879) * fix(devcontainers): Replace PDM with UV * chore(devcontainers): Address review comments * chore(devcontainers): Better approach to get uv --------- Co-authored-by: Alc-Alc Co-authored-by: Jacob Coffee --- .devcontainer/Dockerfile | 11 ++++++++--- .devcontainer/devcontainer.json | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d613795e8e..2513f353b5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,13 @@ # [Choice] Python version (use -bookworm or -bullseye variants on local arm64/Apple Silicon): 3, 3.13, 3.12, 3.11, 3.10, 3.9, 3.8, 3-bookworm, 3.13-bookworm, 3.12-bookworm, 3.11-bookworm, 3.10-bookworm, 3.9-bookworm, 3.8-bookworm, 3-bullseye, 3.11-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3-buster, 3.11-buster, 3.10-buster, 3.9-buster, 3.8-buster -ARG VARIANT=3.12-bookworm -FROM python:${VARIANT} +ARG VERSION=3.12 +ARG VARIANT=-bookworm +FROM python:${VERSION}${VARIANT} + +ARG VERSION +ENV UV_LOCKED=1 UV_PYTHON=${VERSION} +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get purge -y fish -RUN python3 -m pip install --upgrade setuptools cython pip pdm +RUN python3 -m pip install --upgrade setuptools cython pip diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7164363c93..cc7e84c193 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -59,8 +59,8 @@ }, "forwardPorts": [8000], "postCreateCommand": [ - "pdm", - "install" + "uv", + "sync" ], "remoteUser": "vscode" }