Skip to content

Commit 88a4794

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into distro-meson
2 parents 51339d1 + 4cdd703 commit 88a4794

File tree

327 files changed

+5149
-2386
lines changed

Some content is hidden

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

327 files changed

+5149
-2386
lines changed

.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: 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+
}

.github/workflows/ci-meson.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
tests: 'new'
3737
# one additional editable run in pull_request, this has no effect if not pull_request
3838
- os: 'ubuntu'
39-
python: 3.12
39+
python: '3.12'
4040
editable: true
4141
tests: 'all'
4242
- os: windows
@@ -185,5 +185,5 @@ jobs:
185185
uses: actions/[email protected]
186186
if: failure()
187187
with:
188-
name: ${{ runner.os }}-meson-${{ matrix.python }}${{ matrix.editable && '-editable' || '' }}-log
188+
name: ${{ runner.os }}-meson-${{ matrix.python }}${{ matrix.editable && '-editable' || '' }}${{ matrix.tests == 'new' && '-new' || '' }}-log
189189
path: builddir/meson-logs/

.github/workflows/ci.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
- fedora:41
2424
- fedora:42
2525
- ghcr.io/void-linux/void-glibc-full
26+
- archlinux
2627
#- ubuntu:22.04 - fails due to issue with cypari2
2728
#- ubuntu:24.04 - fails due to issue with cypari2
2829
- ubuntu:25.04
@@ -38,6 +39,11 @@ jobs:
3839
# node-based actions require libstdc++.so.6
3940
xbps-install -Sy libstdc++ bash git
4041
fi
42+
if [ "${{ matrix.container }}" = "archlinux" ]; then
43+
# The archlinux container is configured to not install docs by default
44+
# but we need the maxima help to be in place
45+
sed -i '/^NoExtract/d' /etc/pacman.conf
46+
fi
4147
4248
- name: Checkout code
4349
# cannot use v4 yet because of https://github.com/actions/checkout/issues/1487
@@ -51,7 +57,11 @@ jobs:
5157
- name: Set up Python
5258
run: |
5359
uv python install
54-
uv venv
60+
if [ "${{ matrix.container }}" = "ghcr.io/void-linux/void-glibc-full" ] || [ "${{ matrix.container }}" = "archlinux" ]; then
61+
uv venv --system-site-packages
62+
else
63+
uv venv
64+
fi
5565
. .venv/bin/activate
5666
echo PATH=$PATH >> $GITHUB_ENV
5767

.github/workflows/dist.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' && github.event_name != 'pull_request' }}
8686
steps:
8787
- uses: actions/checkout@v4
88-
88+
8989
- name: Setup Conda environment
9090
uses: conda-incubator/setup-miniconda@v3
9191
with:
@@ -141,14 +141,14 @@ jobs:
141141
path: dist
142142
- name: Create release
143143
env:
144-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
144+
GITHUB_PAT: ${{ secrets.RELEASE_CREATION_TOKEN }}
145145
run: |
146146
latest_release_tag=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases \
147147
| jq -r 'sort_by(.created_at) | last(.[]).tag_name')
148148
release_notes=$(curl -s \
149149
-X POST \
150150
-H "Accept: application/vnd.github+json" \
151-
-H "Authorization: Bearer $GITHUB_TOKEN" \
151+
-H "Authorization: Bearer $GITHUB_PAT" \
152152
-H "X-GitHub-Api-Version: 2022-11-28" \
153153
https://api.github.com/repos/${{ github.repository }}/releases/generate-notes \
154154
-d "{
@@ -160,7 +160,7 @@ jobs:
160160
curl -L \
161161
-X POST \
162162
-H "Accept: application/vnd.github+json" \
163-
-H "Authorization: Bearer $GITHUB_TOKEN" \
163+
-H "Authorization: Bearer $GITHUB_PAT" \
164164
-H "X-GitHub-Api-Version: 2022-11-28" \
165165
https://api.github.com/repos/${{ github.repository }}/releases \
166166
-d "{
@@ -174,6 +174,8 @@ jobs:
174174
files: |
175175
dist/*
176176
upstream/*
177+
token: ${{ secrets.GITHUB_TOKEN }}
178+
tag_name: ${{ github.ref_name }}
177179
permissions:
178180
contents: write
179181

.github/workflows/doc-build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
path: ~/conda_pkgs_dir
4545
key:
4646
${{ runner.os }}-conda-${{ hashFiles('environment-${{ env.PYTHON_VERSION }}-linux.yml') }}
47-
47+
4848
- name: Compiler cache
4949
uses: hendrikmuhs/[email protected]
5050
with:
@@ -62,7 +62,7 @@ jobs:
6262
channel-priority: true
6363
activate-environment: sage-dev
6464
environment-file: environment-${{ env.PYTHON_VERSION }}-linux.yml
65-
65+
6666
- name: Build Sage
6767
shell: bash -l {0}
6868
run: |
@@ -123,6 +123,7 @@ jobs:
123123
-e 's;#L[0-9]*";";' \
124124
-e 's;tab-set--[0-9]*-;tab-set-;g' \
125125
-e 's;"tab-set--[0-9]*";"tab-set";' \
126+
-e 's/0x[0-9a-fA-F]*>/0x12345678\>/' \
126127
&& true)
127128
# If the regex list above is changed, the sed command in "Copy doc" step should also be changed
128129
# Create git repo from old doc
@@ -168,6 +169,7 @@ jobs:
168169
-e 's;#L[0-9]*";";' \
169170
-e 's;tab-set--[0-9]*-;tab-set-;g' \
170171
-e 's;"tab-set--[0-9]*";"tab-set";' \
172+
-e 's/0x[0-9a-fA-F]*>/0x12345678\>/' \
171173
&& git commit -a -m 'wipe-out')
172174
# If the regex list above is changed, the sed command in "Store old doc" step should also be changed
173175
# Since HEAD is at commit 'wipe-out', HEAD~1 is commit 'new' (new doc), HEAD~2 is commit 'old' (old doc)

0 commit comments

Comments
 (0)