Skip to content

Commit cb880e8

Browse files
dimpasedimpase
authored
Merge branch 'develop' into m4fixes10.7
2 parents 9bbf612 + cb03043 commit cb880e8

File tree

265 files changed

+6467
-1754
lines changed

Some content is hidden

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

265 files changed

+6467
-1754
lines changed

‎.devcontainer/portability-void/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM ghcr.io/void-linux/void-glibc-full
2+
RUN xbps-install -Suy bash git python
3+
RUN chsh -s /usr/bin/bash

‎.devcontainer/portability-void/devcontainer.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "void",
4+
// Doesn't include 'bash', so we use a custom dockerfile
5+
// "image": "ghcr.io/void-linux/void-glibc-full",
6+
"dockerFile": "Dockerfile",
7+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
8+
"features": {
9+
// Git feature is not compatible with Void Linux, so we install it manually in the Dockerfile
10+
// https://github.com/devcontainers/features/issues/824
11+
//"ghcr.io/devcontainers/features/git": {},
12+
//"ghcr.io/devcontainers/features/python:1": {},
13+
"../uv": {
14+
"version": "latest"
15+
}
16+
},
17+
"customizations": {
18+
"vscode": {
19+
"extensions": [
20+
"ms-python.python"
21+
]
22+
}
23+
}
24+
}

‎.github/workflows/ci-macos.yml

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,56 +21,51 @@ on:
2121
pull_request:
2222
paths:
2323
- '.github/workflows/ci-macos.yml'
24-
- '.github/workflows/macos.yml'
2524
push:
2625
tags:
2726
- '*'
2827
workflow_dispatch:
2928
# Allow to run manually
3029

31-
env:
32-
TARGETS_PRE: all-sage-local
33-
TARGETS: build
34-
TARGETS_OPTIONAL: ptest
35-
3630
jobs:
37-
stage-1:
38-
uses: ./.github/workflows/macos.yml
39-
with:
40-
stage: "1"
41-
timeout: 14400
42-
43-
stage-2:
44-
uses: ./.github/workflows/macos.yml
45-
with:
46-
stage: "2"
47-
needs: [stage-1]
48-
if: ${{ success() || failure() }}
31+
macos:
32+
name: Build and Test (macos-${{ matrix.version }})
33+
runs-on: macos-${{ matrix.version }}
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
version:
38+
- '13'
39+
- '14'
40+
- '15'
4941

50-
stage-2-optional-0-o:
51-
uses: ./.github/workflows/macos.yml
52-
with:
53-
stage: "2-optional-0-o"
54-
needs: [stage-2]
55-
if: ${{ success() || failure() }}
42+
steps:
43+
- name: Checkout code
44+
uses: actions/checkout@v4
5645

57-
stage-2-optional-p-z:
58-
uses: ./.github/workflows/macos.yml
59-
with:
60-
stage: "2-optional-p-z"
61-
needs: [stage-2-optional-0-o]
62-
if: ${{ success() || failure() }}
46+
- uses: actions/setup-python@v5
47+
with:
48+
python-version: "3.13"
49+
50+
- name: Install test prerequisites
51+
run: python -m pip install tox
6352

64-
stage-2-experimental-0-o:
65-
uses: ./.github/workflows/macos.yml
66-
with:
67-
stage: "2-experimental-0-o"
68-
needs: [stage-2-optional-p-z]
69-
if: ${{ success() || failure() }}
53+
- name: Install dependencies
54+
run: |
55+
eval $(build/bin/sage-print-system-package-command homebrew update)
56+
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:)))
7057
71-
stage-2-experimental-p-z:
72-
uses: ./.github/workflows/macos.yml
73-
with:
74-
stage: "2-experimental-p-z"
75-
needs: [stage-2-experimental-0-o]
76-
if: ${{ success() || failure() }}
58+
- name: Build
59+
run: |
60+
source ./.homebrew-build-env
61+
./bootstrap
62+
./configure --enable-download-from-upstream-url
63+
make build V=0
64+
env:
65+
MAKE: 'make -j6'
66+
67+
- name: Test
68+
run: |
69+
source ./.homebrew-build-env # Needed so that runtime cython can find the dependencies
70+
./sage -t --all -p4
71+

‎.github/workflows/ci.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,23 @@ jobs:
2222
container:
2323
- fedora:41
2424
- fedora:42
25+
- ghcr.io/void-linux/void-glibc-full
2526
#- ubuntu:22.04 - fails due to issue with cypari2
2627
#- ubuntu:24.04 - fails due to issue with cypari2
2728
- ubuntu:25.04
2829
container:
2930
image: ${{ matrix.container }}
3031

3132
steps:
33+
- name: Prepare container
34+
run: |
35+
if [ "${{ matrix.container }}" = "ghcr.io/void-linux/void-glibc-full" ]; then
36+
xbps-install -Syu xbps
37+
xbps-install -yu
38+
# node-based actions require libstdc++.so.6
39+
xbps-install -Sy libstdc++ bash git
40+
fi
41+
3242
- name: Checkout code
3343
# cannot use v4 yet because of https://github.com/actions/checkout/issues/1487
3444
uses: actions/checkout@v3
@@ -85,10 +95,10 @@ jobs:
8595
id: clear-container-name
8696
if: failure() || success()
8797
run: |
88-
# Output the container name, but with ":" replaced by "-"
89-
# This is needed to avoid issues with the upload-artifact action
90-
CONTAINER_NAME=$(echo "${{ matrix.container }}" | tr ':' '-')
91-
echo "CONTAINER_NAME=$CONTAINER_NAME" >> $GITHUB_OUTPUT
98+
# Output the container name, but with ":" and "/" replaced by "-"
99+
# This is needed to avoid issues with the upload-artifact action
100+
CONTAINER_NAME=$(echo "${{ matrix.container }}" | tr ':/' '--')
101+
echo "CONTAINER_NAME=$CONTAINER_NAME" >> $GITHUB_OUTPUT
92102
93103
- name: Upload log
94104
uses: actions/[email protected]

‎.github/workflows/macos.yml

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

‎.upstream.d/20-github.com-sagemath-sage-releases

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Upstream packages as uploaded as GitHub release assets.
22
# This file is automatically updated by the update-version script.
3+
https://github.com/sagemath/sage/releases/download/10.8/
34
https://github.com/sagemath/sage/releases/download/10.7/
45
https://github.com/sagemath/sage/releases/download/10.6/

‎CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title: SageMath
44
abstract: SageMath is a free open-source mathematics software system.
55
authors:
66
- name: "The SageMath Developers"
7-
version: 10.7
7+
version: 10.8.beta0
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-08-09
9+
date-released: 2025-08-16
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

‎VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.7, Release Date: 2025-08-09
1+
SageMath version 10.8.beta0, Release Date: 2025-08-16

‎build/bin/sage-print-system-package-command

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ case $system:$command in
172172
fi
173173
;;
174174
void*:update)
175-
print_shell_command "${SUDO}xbps-install -Su"
175+
print_shell_command "${SUDO}xbps-install -Suy"
176176
;;
177177
void*:install)
178178
[ "$YES" = yes ] && options="$options --yes"

‎build/pkgs/beniget/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=beniget-VERSION.tar.gz
2-
sha1=0167f16d17fbd61b91e620bca07e4ec7054ce51d
3-
sha256=75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c
2+
sha1=95233c191f0ea8486a8ef0cf40d9c5a9838f2439
3+
sha256=a0258537e65e7e14ec33a86802f865a667f949bb6c73646d55e42f7c45a052ae
44
upstream_url=https://files.pythonhosted.org/packages/source/b/beniget/beniget-VERSION.tar.gz

0 commit comments

Comments
 (0)