Merge remote-tracking branch 'upstream/develop' into pytest-ci

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,15 +16,16 @@ 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" \
-    "cython >=3.0, != 3.0.3, != 3.1.0" \
-    "cython >=3.0, != 3.0.3" \
+    "cysignals >=1.11.2, != 1.12.0" \
+    "cython >=3.0, != 3.0.3, < 3.1.0" \
     "gmpy2 ~=2.1.b999" \
     memory_allocator \
     "numpy >=1.25" \
     jinja2 \
-    setuptool
-uv sync --frozen --inexact --no-build-isolation
+    setuptools
+uv sync --frozen --inexact --no-build-isolation -v --config-settings=builddir=build/build-$SYSTEM-$devcontainerId

.devcontainer/portability-archlinux-latest-minimal/devcontainer.json

@@ -0,0 +1,2 @@
+FROM archlinux
+RUN pacman -Syu --noconfirm bash git python

.devcontainer/portability-archlinux-latest-minimal/portability-Dockerfile

@@ -0,0 +1,27 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "archlinux",
+    //"image": "archlinux",
+    "dockerFile": "Dockerfile",
+    "onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
+    "features": {
+        // Git feature is not compatible with Arch Linux, so we install it manually in the Dockerfile 
+        // https://github.com/devcontainers/features/issues/824
+        //"ghcr.io/devcontainers/features/git": {},
+        //"ghcr.io/devcontainers/features/python:1": {},
+        "../uv": {
+			"version": "latest"
+		}
+    },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-python.python"
+            ]
+        }
+    }
+}

.devcontainer/portability-archlinux-latest-standard/devcontainer.json

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

.devcontainer/portability-archlinux-latest-standard/portability-Dockerfile

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

.devcontainer/portability-archlinux/Dockerfile

@@ -0,0 +1,24 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "ubuntu-22.04",
+    "image": "ubuntu:22.04",
+    "onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
+    "features": {
+        "ghcr.io/devcontainers/features/git": {},
+        "ghcr.io/devcontainers/features/python:1": {},
+        "../uv": {
+			"version": "latest"
+		}
+    },
+    "containerEnv": {
+        "devcontainerId": "${devcontainerId}",
+        "UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}" 
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-python.python"
+            ]
+        }
+    }
+}