Skip to content

Commit c07fc22

Browse files
authored
Merge branch 'sagemath:develop' into formatdocs
2 parents 3395327 + 9f90540 commit c07fc22

File tree

293 files changed

+5700
-4327
lines changed

Some content is hidden

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

293 files changed

+5700
-4327
lines changed

.devcontainer/onCreate-meson.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ uv pip install \
2323
"cypari2 >=2.2.1" \
2424
"cysignals >=1.11.2, != 1.12.0" \
2525
"cython >=3.0, != 3.0.3, < 3.1.0" \
26-
"gmpy2 ~=2.1.b999" \
26+
"gmpy2 >=2.1.5" \
2727
memory_allocator \
2828
"numpy >=1.25" \
2929
jinja2 \

.github/workflows/ci-distro.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@ on:
1919
paths:
2020
- '.github/workflows/ci-distro.yml'
2121
- 'build/pkgs/**'
22+
- 'build/make/**'
2223
- 'configure.ac'
23-
- '!build/pkgs/sage_conf/**'
24-
- '!build/pkgs/sage_docbuild/**'
25-
- '!build/pkgs/sage_setup/**'
26-
- '!build/pkgs/sage_sws2rst/**'
27-
- '!build/pkgs/sagelib/**'
28-
- '!build/pkgs/sagemath_*/**'
2924
push:
3025
tags:
3126
- '*'
@@ -35,7 +30,7 @@ on:
3530
env:
3631
TARGETS_PRE: all-sage-local
3732
TARGETS: build
38-
TARGETS_OPTIONAL: ptest
33+
TARGETS_OPTIONAL: ptestlong
3934

4035
permissions:
4136
packages: write
@@ -56,7 +51,7 @@ jobs:
5651
# FIXME: duplicated from env.TARGETS
5752
targets_pre: all-sage-local
5853
targets: build
59-
targets_optional: ptest
54+
targets_optional: ptestlong
6055
tox_system_factors: >-
6156
["ubuntu-jammy"]
6257
tox_packages_factors: >-
@@ -71,7 +66,7 @@ jobs:
7166
docker_targets: "with-system-packages configured with-targets-pre with-targets with-targets-optional"
7267
targets_pre: all-sage-local
7368
targets: build
74-
targets_optional: ptest
69+
targets_optional: ptestlong
7570
tox_packages_factors: >-
7671
["standard"]
7772
docker_push_repository: ghcr.io/${{ github.repository }}/

.github/workflows/ci-meson.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,24 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
os: ['ubuntu', 'macos', 'windows']
31-
python: ['3.11', '3.12']
31+
python: ['3.12', '3.13']
3232
tests: ['all']
3333
editable:
3434
${{ fromJson(github.event_name == 'pull_request' && '[false]' || '[false, true]') }}
3535
include:
36+
# One run for oldest supported Python
37+
- os: 'ubuntu'
38+
python: '3.11'
39+
tests: 'all'
40+
# Test only changed files
3641
- os: 'ubuntu'
3742
python: '3.12'
3843
tests: 'new'
39-
# one additional editable run in pull_request, this has no effect if not pull_request
44+
# One additional editable run in pull_request, this has no effect if not pull_request
4045
- os: 'ubuntu'
4146
python: '3.12'
4247
editable: true
4348
tests: 'all'
44-
- os: windows
45-
python: '3.13'
46-
tests: 'all'
4749

4850
steps:
4951
- uses: actions/checkout@v4

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
"cypari2 >=2.2.1" \
9292
"cysignals >=1.11.2, != 1.12.0" \
9393
"cython >=3.0, != 3.0.3, < 3.1.0" \
94-
"gmpy2 ~=2.1.b999" \
94+
"gmpy2 >=2.1.5" \
9595
memory_allocator \
9696
"numpy >=1.25" \
9797
jinja2 \

.github/workflows/dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ jobs:
241241
run: |
242242
"${{ steps.python.outputs.python-path }}" -m pip install cibuildwheel==3.0.1
243243
export PATH=build/bin:$PATH
244-
echo CIBW_BEFORE_ALL="( $(sage-print-system-package-command debian --yes --no-install-recommends install $(sage-get-system-packages debian $SPKGS)) || $(sage-print-system-package-command fedora --yes --no-install-recommends install $(sage-get-system-packages fedora $SPKGS | sed s/pkg-config/pkgconfig/)) || ( $(sage-print-system-package-command homebrew --yes --no-install-recommends install $(sage-get-system-packages homebrew $SPKGS)) || $(sage-print-system-package-command alpine --yes --no-install-recommends install $(sage-get-system-packages alpine $SPKGS)) || echo error ignored) ) && if cp /host/sage-\$AUDITWHEEL_PLAT/config.status . 2>/dev/null; then chmod +x config.status; fi && if [ -x ./config.status ]; then ./config.status; else ./configure --enable-build-as-root ${{ startsWith(matrix.os, 'ubuntu') && '--prefix=/host/sage-\$AUDITWHEEL_PLAT' || '' }} && cp config.status prefix/; fi && MAKE=\"make -j6\" make V=0 $TARGETS_PRE && (echo \"sage_conf @ file://\$(pwd)/pkgs/sage-conf\" && echo \"sage_setup @ file://\$(pwd)/pkgs/sage-setup\") > constraints.txt" >> "$GITHUB_ENV"
244+
echo CIBW_BEFORE_ALL="( $(sage-print-system-package-command debian --yes --no-install-recommends install $(sage-get-system-packages debian $SPKGS)) || $(sage-print-system-package-command fedora --yes --no-install-recommends install $(sage-get-system-packages fedora $SPKGS | sed s/pkg-config/pkgconfig/)) || ( $(sage-print-system-package-command homebrew --yes --no-install-recommends install $(sage-get-system-packages homebrew $SPKGS)) || $(sage-print-system-package-command alpine --yes --no-install-recommends install $(sage-get-system-packages alpine $SPKGS)) || echo error ignored) ) && if cp /host/sage-\$AUDITWHEEL_PLAT/config.status . 2>/dev/null; then chmod +x config.status; fi && if [ -x ./config.status ]; then ./config.status; else ./configure --enable-build-as-root ${{ startsWith(matrix.os, 'ubuntu') && '--prefix=/host/sage-\$AUDITWHEEL_PLAT' || '' }} && cp config.status prefix/; fi && MAKE=\"make -j6\" make V=0 $TARGETS_PRE && echo \"sage_setup @ file://\$(pwd)/pkgs/sage-setup\") > constraints.txt" >> "$GITHUB_ENV"
245245
mkdir -p unpacked
246246
for sdist in dist/$pkg*.tar.gz; do
247247
(cd unpacked && tar xfz - ) < $sdist

.gitignore

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -205,16 +205,6 @@ build/pkgs/wheel/version_requirements.txt
205205
/pkgs/*/venv*
206206
/pkgs/*/.venv*
207207

208-
/pkgs/sage-conf_pypi/sage_root/config.log
209-
/pkgs/sage-conf_pypi/sage_root/config.status
210-
/pkgs/sage-conf_pypi/sage_root/local/
211-
/pkgs/sage-conf_pypi/sage_root/logs/
212-
/pkgs/sage-conf_pypi/sage_root/prefix
213-
/pkgs/sage-conf_pypi/sage_root/src/bin/sage-env-config
214-
/pkgs/sage-conf_pypi/sage_root/src/bin/sage-src-env-config
215-
/pkgs/sage-conf_pypi/sage_root/upstream/
216-
/pkgs/sage-conf_pypi/sage_root/venv
217-
218208
/pkgs/sagemath-objects/setup.cfg
219209
/pkgs/sagemath-bliss/setup.cfg
220210
/pkgs/sagemath-coxeter3/setup.cfg
@@ -462,6 +452,7 @@ src/sage/graphs/graph_decompositions/__init__.py
462452
src/sage/graphs/generators/__init__.py
463453
src/sage/graphs/__init__.py
464454
src/sage/graphs/base/__init__.py
455+
src/sage/graphs/tests/__init__.py
465456
src/sage/databases/__init__.py
466457
src/sage/stats/hmm/__init__.py
467458
src/sage/stats/__init__.py

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// Exclude symbolic links into SAGE_ROOT/pkgs/
99
"build/pkgs/*/src": true,
1010
// Exclude symbolic links into SAGE_ROOT/src/
11-
"pkgs/sage-conf_pypi/sage_root": true,
1211
"pkgs/sage-docbuild/sage_docbuild": true,
1312
"pkgs/sage-setup/sage_setup": true,
1413
"pkgs/sagemath-*/sage": true,

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.8.beta6
7+
version: 10.8.beta7
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-10-06
9+
date-released: 2025-10-16
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ SAGE_ROOT_LOGS = logs
4242

4343
# CONFIG_FILES lists all files that appear in AC_CONFIG_FILES in configure.ac;
4444
# except for build/make/Makefile-auto, which is unused by the build system
45-
CONFIG_FILES = build/make/Makefile src/bin/sage-env-config build/bin/sage-build-env-config pkgs/sage-conf/_sage_conf/_conf.py
45+
CONFIG_FILES = build/make/Makefile src/bin/sage-env-config build/bin/sage-build-env-config
4646

4747
# SPKG_COLLECT_FILES contains the files that influence the *runtime* of the
4848
# portions of the 'configure' script generated by the SAGE_SPKG_COLLECT macro

README.md

Lines changed: 0 additions & 47 deletions

0 commit comments

Comments
 (0)