Skip to content

Commit 2ef51cb

Browse files
authored
Merge branch 'sagemath:develop' into fix-unhashable-doctests-develop
2 parents 32899be + aa27703 commit 2ef51cb

File tree

875 files changed

+4457
-4290
lines changed

Some content is hidden

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

875 files changed

+4457
-4290
lines changed
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": "debian-forky",
4+
"image": "debian:forky",
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+
"containerEnv": {
14+
"devcontainerId": "${devcontainerId}",
15+
"UV_PROJECT_ENVIRONMENT": ".venv-${devcontainerId}"
16+
},
17+
"customizations": {
18+
"vscode": {
19+
"extensions": [
20+
"ms-python.python"
21+
]
22+
}
23+
}
24+
}

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
container:
2424
- fedora:41
2525
- fedora:42
26+
- debian:forky
2627
- ghcr.io/void-linux/void-glibc-full
2728
- archlinux
2829
#- ubuntu:22.04 - fails due to issue with cypari2

.github/workflows/dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185
# SPKGs to install as system packages
186186
SPKGS: _bootstrap _prereq
187187
# Non-Python packages to install as spkgs
188-
TARGETS_PRE: gmp mpfr mpc bliss coxeter3 mcqd meataxe sirocco boost_cropped tdlib
188+
TARGETS_PRE: gmp mpfr mpc bliss coxeter3 mcqd meataxe sirocco tdlib
189189
CIBW_BUILD: "*${{ matrix.build }}*"
190190
# Disable building PyPy wheels on all platforms
191191
CIBW_SKIP: "pp*"

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ __pycache__/
157157
# C header generated by Cython
158158
/src/sage/modular/arithgroup/farey_symbol.h
159159
# List of C and C++ files that are actual source files,
160-
# NOT generated by Cython. The same list appears in src/MANIFEST.in
160+
# NOT generated by Cython
161161
!/src/sage/graphs/base/boost_interface.cpp
162162
!/src/sage/graphs/cliquer/cl.c
163163
!/src/sage/graphs/graph_decompositions/sage_tdlib.cpp
@@ -170,7 +170,7 @@ __pycache__/
170170
!/src/sage/rings/bernmm/bern_modp_util.cpp
171171
!/src/sage/rings/bernmm/bern_rat.cpp
172172
!/src/sage/rings/bernmm/bernmm-test.cpp
173-
!/src/sage/rings/padics/transcendantal.c
173+
!/src/sage/rings/padics/transcendental.c
174174
!/src/sage/rings/polynomial/weil/power_sums.c
175175
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.cpp
176176
!/src/sage/schemes/hyperelliptic_curves/hypellfrob/recurrences_ntl.cpp

.homebrew-build-env

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ for l in bzip2 texinfo polymake; do
88
fi
99
done
1010
export PATH
11-
PKG_CONFIG_PATH="$HOMEBREW/lib/pkgconfig:$PKG_CONFIG_PATH"
11+
if [ -z "$PKG_CONFIG_PATH" ]; then
12+
PKG_CONFIG_PATH="$HOMEBREW/lib/pkgconfig"
13+
else
14+
PKG_CONFIG_PATH="$HOMEBREW/lib/pkgconfig:$PKG_CONFIG_PATH"
15+
fi
1216
# libpng.pc depends on zlib.pc
1317
for l in openblas openssl readline sqlite zlib; do
1418
if [ -d "$HOMEBREW/opt/$l/lib/pkgconfig" ]; then

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"Cython",
4343
"d'Alembertian",
4444
"dalembertian",
45+
"devcontainers",
4546
"disp",
4647
"doctest",
4748
"doctests",

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

COPYING.txt

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ SOFTWARE LICENSE
3333
-----------------------------------------------------------------------
3434
boehm_gc MIT-like license (see below)
3535
backports_ssl_match_hostname Python License
36-
boost_cropped Boost Software License (see below)
3736
cddlib GPLv2+
3837
certifi ISC
3938
cliquer GPLv2+
@@ -795,35 +794,6 @@ simplicity, included in its entirety.
795794

796795
================================================================================
797796

798-
boost_cropped:
799-
(http://www.boost.org/LICENSE_1_0.txt)
800-
801-
Boost Software License - Version 1.0 - August 17th, 2003
802-
803-
Permission is hereby granted, free of charge, to any person or organization
804-
obtaining a copy of the software and accompanying documentation covered by
805-
this license (the "Software") to use, reproduce, display, distribute,
806-
execute, and transmit the Software, and to prepare derivative works of the
807-
Software, and to permit third-parties to whom the Software is furnished to
808-
do so, all subject to the following:
809-
810-
The copyright notices in the Software and this entire statement, including
811-
the above license grant, this restriction and the following disclaimer,
812-
must be included in all copies of the Software, in whole or in part, and
813-
all derivative works of the Software, unless such copies or derivative
814-
works are solely in the form of machine-executable object code generated by
815-
a source language processor.
816-
817-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
818-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
819-
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
820-
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
821-
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
822-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
823-
DEALINGS IN THE SOFTWARE.
824-
825-
================================================================================
826-
827797
bzip2:
828798
(http://www.bzip.org/)
829799
This program, "bzip2", the associated library "libbzip2", and all

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ misc-clean:
156156
rm -f aclocal.m4 config.log confcache
157157
rm -rf autom4te.cache
158158
rm -f build/make/Makefile build/make/Makefile-auto
159+
rm -f build/platform/meson/sage-configure-native-file.ini
159160
rm -rf src/lib
160161

161162
bdist-clean: clean

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.8.beta7
1+
10.8.beta8

0 commit comments

Comments
 (0)