Skip to content

Commit 214fc09

Browse files
tobiasdieztobiasdiez
committed
Merge remote-tracking branch 'upstream/develop' into remove-sage-conf
2 parents d012f55 + 1f45900 commit 214fc09

File tree

1,521 files changed

+34734
-18067
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,521 files changed

+34734
-18067
lines changed

‎.devcontainer/onCreate-meson.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ uv venv
2020
uv pip install \
2121
meson-python \
2222
"cypari2 >=2.2.1" \
23-
"cython >=3.0, != 3.0.3, != 3.1.0" \
24-
"cython >=3.0, != 3.0.3" \
23+
"cysignals >=1.11.2, != 1.12.0" \
24+
"cython >=3.0, != 3.0.3, < 3.1.0" \
2525
"gmpy2 ~=2.1.b999" \
2626
memory_allocator \
2727
"numpy >=1.25" \
2828
jinja2 \
29-
setuptool
30-
uv sync --frozen --inexact --no-build-isolation
29+
setuptools
30+
uv sync --frozen --inexact --no-build-isolation --config-settings=builddir=build/build-$SYSTEM

‎.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.

‎.devcontainer/portability-archlinux/Dockerfile‎

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

‎.devcontainer/portability-archlinux/devcontainer.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
"customizations": {
17+
"vscode": {
18+
"extensions": [
19+
"ms-python.python"
20+
]
21+
}
22+
}
23+
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "ubuntu-22.04",
4+
"image": "ubuntu:22.04",
5+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
6+
"features": {
7+
"ghcr.io/devcontainers/features/git": {},
8+
"ghcr.io/devcontainers/features/python:1": {},
9+
"../uv": {
10+
"version": "latest"
11+
}
12+
},
13+
"customizations": {
14+
"vscode": {
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}
19+
}
20+
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "ubuntu-24.04",
4+
"image": "ubuntu:24.04",
5+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
6+
"features": {
7+
"ghcr.io/devcontainers/features/git": {},
8+
"ghcr.io/devcontainers/features/python:1": {},
9+
"../uv": {
10+
"version": "latest"
11+
}
12+
},
13+
"customizations": {
14+
"vscode": {
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}
19+
}
20+
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "ubuntu-25.04",
4+
"image": "ubuntu:25.04",
5+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
6+
"features": {
7+
"ghcr.io/devcontainers/features/git": {},
8+
"ghcr.io/devcontainers/features/python:1": {},
9+
"../uv": {
10+
"version": "latest"
11+
}
12+
},
13+
"customizations": {
14+
"vscode": {
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}
19+
}
20+
}

0 commit comments

Comments
 (0)