Skip to content

Commit e44838f

Browse files
authored
Merge branch 'develop' into fix-fricas-doctest-pickling
2 parents b38bf8d + 9f90540 commit e44838f

File tree

1,755 files changed

+39076
-20236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,755 files changed

+39076
-20236
lines changed

.devcontainer/onCreate-meson.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

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

@@ -16,15 +16,16 @@ eval $(build/bin/sage-print-system-package-command $SYSTEM --yes --ignore-missin
1616

1717
# Disable build isolation following the advice of https://mesonbuild.com/meson-python/how-to-guides/editable-installs.html#build-dependencies
1818
# Install build dependencies manually as workaround for https://github.com/astral-sh/uv/issues/1516
19-
uv venv
19+
uv venv --clear
20+
. $UV_PROJECT_ENVIRONMENT/bin/activate # https://github.com/astral-sh/uv/issues/14022
2021
uv pip install \
2122
meson-python \
2223
"cypari2 >=2.2.1" \
2324
"cysignals >=1.11.2, != 1.12.0" \
2425
"cython >=3.0, != 3.0.3, < 3.1.0" \
25-
"gmpy2 ~=2.1.b999" \
26+
"gmpy2 >=2.1.5" \
2627
memory_allocator \
2728
"numpy >=1.25" \
2829
jinja2 \
2930
setuptools
30-
uv sync --frozen --inexact --no-build-isolation --config-settings=builddir=build/build-$SYSTEM
31+
uv sync --frozen --inexact --no-build-isolation -v --config-settings=builddir=build/build-$SYSTEM-$devcontainerId

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FROM archlinux
2+
RUN pacman -Syu --noconfirm bash git python
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "archlinux",
4+
//"image": "archlinux",
5+
"dockerFile": "Dockerfile",
6+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
7+
"features": {
8+
// Git feature is not compatible with Arch Linux, so we install it manually in the Dockerfile
9+
// https://github.com/devcontainers/features/issues/824
10+
//"ghcr.io/devcontainers/features/git": {},
11+
//"ghcr.io/devcontainers/features/python:1": {},
12+
"../uv": {
13+
"version": "latest"
14+
}
15+
},
16+
"containerEnv": {
17+
"devcontainerId": "${devcontainerId}",
18+
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
19+
},
20+
"customizations": {
21+
"vscode": {
22+
"extensions": [
23+
"ms-python.python"
24+
]
25+
}
26+
}
27+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
"version": "latest"
1111
}
1212
},
13+
"containerEnv": {
14+
"devcontainerId": "${devcontainerId}",
15+
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
16+
},
1317
"customizations": {
1418
"vscode": {
1519
"extensions": [

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
"version": "latest"
1111
}
1212
},
13+
"containerEnv": {
14+
"devcontainerId": "${devcontainerId}",
15+
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
16+
},
1317
"customizations": {
1418
"vscode": {
1519
"extensions": [

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
"version": "latest"
1111
}
1212
},
13+
"containerEnv": {
14+
"devcontainerId": "${devcontainerId}",
15+
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
16+
},
1317
"customizations": {
1418
"vscode": {
1519
"extensions": [

0 commit comments

Comments
 (0)