Skip to content

Commit 361c28e

Browse files
committed
sagemath: update to 10.8.
1 parent 962568c commit 361c28e

8 files changed

+62
-274
lines changed

srcpkgs/sagemath/patches/40594-Fix_segfault_in_libgap.patch

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py
2+
index 637ef29a6f2..8b5bf5a6d4f 100644
3+
--- a/src/sage/interfaces/maxima_lib.py
4+
+++ b/src/sage/interfaces/maxima_lib.py
5+
@@ -210,7 +210,7 @@
6+
if MAXIMA_SHARE:
7+
import_packages = "{affine,algebra,algebra/charsets,algebra/solver,amatrix,bernstein,calculus,cobyla,cobyla/ex,cobyla/lisp,colnew,colnew/ex1,colnew/ex2,colnew/ex3,colnew/ex4,colnew/lisp,combinatorics,contrib,contrib/Eulix,contrib/Grobner,contrib/Zeilberger,contrib/alt-display,contrib/altsimp,contrib/binsplit,contrib/bitwise,contrib/boolsimp,contrib/coma,contrib/diffequations,contrib/diffequations/tests,contrib/elliptic_curves,contrib/elliptic_curves/figures,contrib/format,contrib/fresnel,contrib/gentran,contrib/gentran/man,contrib/gentran/test,contrib/gf,contrib/integration,contrib/levin,contrib/lurkmathml,contrib/maxima-odesolve,contrib/maximaMathML,contrib/mcclim,contrib/noninteractive,contrib/odes,contrib/operatingsystem,contrib/prim,contrib/rand,contrib/rkf45,contrib/sarag,contrib/smath,contrib/state,contrib/symplectic_ode,contrib/trigtools,contrib/unicodedata,contrib/unit,contrib/vector3d,descriptive,diff_form,diff_form/tests,diffequations,distrib,draw,dynamics,ezunits,fftpack5,fftpack5/lisp,finance,fourier_elim,fractals,graphs,hompack,hompack/lisp,hypergeometric,integequations,integer_sequence,integration,lapack,lapack/blas,lapack/lapack,lbfgs,linearalgebra,logic,lsquares,macro,matrix,minpack,minpack/lisp,misc,mnewton,multiadditive,nelder_mead,numeric,numericalio,odepack,odepack/src,orthopoly,pdiff,physics,pslq,pytranslate,quantum,simplex,simplex/Tests,simplification,solve_rat_ineq,solve_rec,sound,stats,stringproc,sym,tensor,tensor/tracefree-code,test_batch_encodings,to_poly_solve,translators,translators/m2mj,trigonometry,utils,vector,z_transform}"
8+
ecl_eval(f'#$file_search_maxima: append(file_search_maxima, ["{MAXIMA_SHARE}/###.{{mac,mc,wxm}}", "{MAXIMA_SHARE}/{import_packages}/###.{{mac,mc,wxm}}"])$')
9+
- ecl_eval(f'#$file_search_lisp: append(file_search_lisp, ["{MAXIMA_SHARE}/###.{{fas,lisp,lsp}}", "{MAXIMA_SHARE}/{import_packages}/###.{{fas,lisp,lsp}}"])$')
10+
+ ecl_eval(f'#$file_search_lisp: append(file_search_lisp, ["{MAXIMA_SHARE}/###.{{fas,lisp,lsp}}", "{MAXIMA_SHARE}/../src/###.{{fas,lisp,lsp}}", "{MAXIMA_SHARE}/{import_packages}/###.{{fas,lisp,lsp}}"])$')
11+
12+
# Default options set in Maxima
13+
# display2d -- no ascii art output
14+
diff --git a/subprojects/packagefiles/maxima/build/doc/info/meson.build b/subprojects/packagefiles/maxima/build/doc/info/meson.build
15+
new file mode 100644
16+
index 00000000000..e8c69f73526
17+
diff --git a/subprojects/packagefiles/maxima/build/doc/meson.build b/subprojects/packagefiles/maxima/build/doc/meson.build
18+
new file mode 100644
19+
index 00000000000..eba36e4bdc3
20+
diff --git a/subprojects/packagefiles/maxima/build/meson.build b/subprojects/packagefiles/maxima/build/meson.build
21+
new file mode 100644
22+
index 00000000000..4112780103d

srcpkgs/sagemath/patches/41021-Refactor_atexit.pyx_for_python_3.14.patch

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

srcpkgs/sagemath/patches/41141-Fix_ipython_9.7.0.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/src/sage/topology/simplicial_set_examples.py b/src/sage/topology/simplicial_set_examples.py
2+
index be7a4084be2..cd69adb9c5a 100644
3+
--- a/src/sage/topology/simplicial_set_examples.py
4+
+++ b/src/sage/topology/simplicial_set_examples.py
5+
@@ -655,7 +655,7 @@ def simplicial_data_from_kenzo_output(filename) -> dict:
6+
sage: S4.homology(reduced=False) # needs pyparsing
7+
{0: Z, 1: 0, 2: 0, 3: 0, 4: Z}
8+
"""
9+
- from pyparsing import OneOrMore, nestedExpr
10+
+ from pyparsing import OneOrMore, nested_expr
11+
12+
with open(filename) as f:
13+
data = f.read()
14+
@@ -675,7 +675,7 @@ def simplicial_data_from_kenzo_output(filename) -> dict:
15+
end = new_dim_idx
16+
if dim == 0:
17+
simplex_string = data[data.find('Vertices :') + len('Vertices :'):end]
18+
- vertices = OneOrMore(nestedExpr()).parseString(simplex_string).asList()[0]
19+
+ vertices = OneOrMore(nested_expr()).parse_string(simplex_string).asList()[0]
20+
for v in vertices:
21+
vertex = AbstractSimplex(0, name=v)
22+
simplex_data[vertex] = None

srcpkgs/sagemath/patches/get_patches

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
version=10.7
3+
version=10.8
44

55
URL_BASE_PR="https://github.com/sagemath/sage/pull/"
66
URL_BASE_COMPARE="https://github.com/sagemath/sage/compare/${version}..."
@@ -30,7 +30,6 @@ get_pr() {
3030
# run from patches dir
3131
cd $(dirname "$0")
3232

33-
# positive review
34-
get_pr 40594 "Fix segfault in libgap"
35-
get_pr 41021 "Refactor atexit.pyx for python 3.14"
36-
get_pr 41141 "Fix compatibility issue for ipython 9.7.0"
33+
# draft/under review
34+
get_pr 40816 "Meson: Build docs for Maxima as well"
35+
get_pr 41395 "Fix test failures with pyparsing 3.3"

srcpkgs/sagemath/patches/sphinx.patch

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

srcpkgs/sagemath/template

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
# Template file for 'sagemath'
22
pkgname=sagemath
3-
version=10.7
4-
revision=4
3+
version=10.8
4+
revision=1
55
_pypi_version=${version/.beta/b}
66
_pypi_version=${_pypi_version/.rc/rc}
77
build_style=python3-pep517
8+
make_build_args="-C setup-args=-Dbuild-docs=false"
89
hostmakedepends="pkg-config python3-Cython python3-Jinja2
910
python3-pkgconfig python3-setuptools python3-wheel
1011
python3-gmpy2 python3-memory_allocator python3-numpy ecl
11-
python3-cypari2 python3-cysignals python3-devel"
12+
python3-cypari2 python3-cysignals python3-devel python3-meson-python"
1213
makedepends="boost-headers brial-devel cliquer-devel ecl eclib-devel
1314
ecm-devel fflas-ffpack flintlib-devel gap-devel gd-devel glpk-devel
1415
gsl-devel iml-devel lcalc-devel libbraiding-devel libhomfly-devel libmpc-devel
@@ -17,7 +18,7 @@ makedepends="boost-headers brial-devel cliquer-devel ecl eclib-devel
1718
python3-cysignals python3-devel python3-gmpy2 python3-memory_allocator
1819
python3-numpy rankwidth-devel singular symmetrica-devel"
1920
depends="eclib-devel fflas-ffpack flintlib-devel gcc-fortran meson gd-devel
20-
gfan gsl-devel gzip libpng-devel linbox-devel m4ri-devel maxima-ecl
21+
gfan gsl-devel gzip libpng-devel linbox-devel m4ri-devel maxima-ecl maxima-src
2122
mpfr-devel nauty ntl-devel palp pari-devel pari-elldata-small pari-galdata
2223
pari-galpol-small pari-seadata-small pkg-config python3-Cython python3-cypari2
2324
python3-cysignals python3-devel python3-fpylll python3-ipython python3-lrcalc
@@ -28,22 +29,20 @@ depends="eclib-devel fflas-ffpack flintlib-devel gcc-fortran meson gd-devel
2829
python3-conway-polynomials sage-data-elliptic_curves sage-data-graphs
2930
sage-data-polytopes_db sympow tachyon threejs-sage
3031
python3-six python3-gmpy2 python3-numpy python3-pexpect python3-Sphinx
31-
python3-Pillow python3-mpmath python3-jupyter_client python3-ptyprocess"
32-
checkdepends="$depends python3-pytest pythran python3-Sphinx gdb"
32+
python3-Pillow python3-mpmath python3-jupyter_client python3-ptyprocess
33+
python3-platformdirs"
34+
checkdepends="${depends} python3-pytest pythran python3-Sphinx gdb"
3335
short_desc="Open source mathematics software"
3436
maintainer="Gonzalo Tornaría <[email protected]>"
3537
license="GPL-2.0-or-later"
3638
homepage="https://www.sagemath.org/"
3739
changelog="https://github.com/sagemath/sage/releases"
38-
distfiles="${PYPI_SITE}/s/sagemath-standard/sagemath_standard-${_pypi_version}.tar.gz"
39-
checksum=f6ec41913a745b94e20ceae69c2c54a7c8e549b3dc8b4a01dbd874c772924149
40+
distfiles="${PYPI_SITE}/s/sagemath/sagemath-${_pypi_version}.tar.gz"
41+
checksum=864c21a84bfad05f586ccdc45bf685552cd87a236bf56bc30163de474569f82c
4042
nocross="due to ntl (eclib, singular), fflas-ffpack, givaro, linbox, sympow, maxima"
4143

42-
# main repo `.../src/sage/` is `.../sage/` here
43-
patch_args=-Np2
44-
4544
# parallel build
46-
export SAGE_NUM_THREADS="$XBPS_MAKEJOBS"
45+
export SAGE_NUM_THREADS="${XBPS_MAKEJOBS}"
4746

4847
post_install() {
4948
# move scripts to /usr/libexec
@@ -74,16 +73,16 @@ do_check() {
7473
fi
7574
cp ${FILESDIR}/timings2.json .
7675
_test_args="--stats_path=timings2.json"
77-
if [ "$XBPS_CHECK_PKGS" = full ]; then
76+
if [ "${XBPS_CHECK_PKGS}" = full ]; then
7877
_test_args+=" --long --warn-long 30.0"
7978
else
8079
_test_args+=" --warn-long 10.0"
8180
fi
82-
if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
81+
if [ "${XBPS_BUILD_ENVIRONMENT}" = "void-packages-ci" ]; then
8382
# for CI use a predictable random seed
8483
_test_args+=" --random-seed=0"
8584
fi
8685

8786
PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \
88-
sage -tp ${XBPS_MAKEJOBS} ${_test_args} ${_test_files}
87+
python3 -m sage.doctest -p ${XBPS_MAKEJOBS} ${_test_args} ${_test_files}
8988
}

0 commit comments

Comments
 (0)