Skip to content

Devcontainer: use devcontainer id as key for venv and build directory #40821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 21, 2025
+32 −3
Merged

Devcontainer: use devcontainer id as key for venv and build directory #40821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c458ffe
Devcontainer: use devcontainer id as key for venv and build directory
tobiasdiez Sep 14, 2025
90f6c93
Merge branch 'develop' into devcontainer-id
dimpase Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .devcontainer/onCreate-meson.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

SYSTEM=$(build/bin/sage-guess-package-system)

if [ "$SYSTEM" = "fedora" ]; then
if [ "$SYSTEM" = "fedora" ] && [ -f /etc/fedora-release ]; then
# Need to use --setopt=tsflags="" to avoid errors with gphelp
dnf5 install -y pari-gp --setopt=tsflags=""

Expand All @@ -16,7 +16,8 @@ eval $(build/bin/sage-print-system-package-command $SYSTEM --yes --ignore-missin

# Disable build isolation following the advice of https://mesonbuild.com/meson-python/how-to-guides/editable-installs.html#build-dependencies
# Install build dependencies manually as workaround for https://github.com/astral-sh/uv/issues/1516
uv venv
uv venv --clear
. $UV_PROJECT_ENVIRONMENT/bin/activate # https://github.com/astral-sh/uv/issues/14022
uv pip install \
meson-python \
"cypari2 >=2.2.1" \
Expand All @@ -27,4 +28,4 @@ uv pip install \
"numpy >=1.25" \
jinja2 \
setuptools
uv sync --frozen --inexact --no-build-isolation --config-settings=builddir=build/build-$SYSTEM
uv sync --frozen --inexact --no-build-isolation -v --config-settings=builddir=build/build-$SYSTEM-$devcontainerId
4 changes: 4 additions & 0 deletions .devcontainer/portability-archlinux/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
"version": "latest"
}
},
"containerEnv": {
"devcontainerId": "${devcontainerId}",
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
},
"customizations": {
"vscode": {
"extensions": [
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/portability-fedora-41/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
"version": "latest"
}
},
"containerEnv": {
"devcontainerId": "${devcontainerId}",
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
},
"customizations": {
"vscode": {
"extensions": [
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/portability-fedora-42/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
"version": "latest"
}
},
"containerEnv": {
"devcontainerId": "${devcontainerId}",
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
},
"customizations": {
"vscode": {
"extensions": [
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/portability-ubuntu-2204/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
"version": "latest"
}
},
"containerEnv": {
"devcontainerId": "${devcontainerId}",
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
},
"customizations": {
"vscode": {
"extensions": [
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/portability-ubuntu-2404/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
"version": "latest"
}
},
"containerEnv": {
"devcontainerId": "${devcontainerId}",
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
},
"customizations": {
"vscode": {
"extensions": [
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/portability-ubuntu-2504/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
"version": "latest"
}
},
"containerEnv": {
"devcontainerId": "${devcontainerId}",
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
},
"customizations": {
"vscode": {
"extensions": [
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/portability-void/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"version": "latest"
}
},
"containerEnv": {
"devcontainerId": "${devcontainerId}",
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
},
"customizations": {
"vscode": {
"extensions": [
Expand Down
Loading