Merge remote-tracking branch 'upstream/develop' into conda-python-13

Author: tobiasdiez

.devcontainer/onCreate-meson.sh

@@ -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=""
 
@@ -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" \
@@ -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

.devcontainer/portability-archlinux/devcontainer.json

@@ -13,6 +13,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-fedora-41/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-fedora-42/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-ubuntu-2204/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-ubuntu-2404/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-ubuntu-2504/devcontainer.json

@@ -10,6 +10,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.devcontainer/portability-void/devcontainer.json

@@ -14,6 +14,10 @@
 			"version": "latest"
 		}
     },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
     "customizations": {
         "vscode": {
             "extensions": [

.github/workflows/ci-macos.yml

@@ -52,6 +52,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          brew uninstall --force cmake || true
           eval $(build/bin/sage-print-system-package-command homebrew update)
           eval $(build/bin/sage-print-system-package-command homebrew --yes --ignore-missing install $(build/bin/sage-get-system-packages homebrew _bootstrap _prereq $(build/bin/sage-package list :standard:)))
 
@@ -68,4 +69,3 @@ jobs:
         run: |
           source ./.homebrew-build-env # Needed so that runtime cython can find the dependencies
           ./sage -t --all -p4
-    

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6.4.3
+        uses: astral-sh/setup-uv@v6.7.0
 
       # We cannot use the setup python action because it doesn't support all containers
       # https://github.com/actions/setup-python/issues/527