Skip to content

Commit 14f8dba

Browse files
committed
sagemath: update to 10.8.
1 parent ebcf4ac commit 14f8dba

9 files changed

+80
-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: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/sage/calculus/desolvers.py b/src/sage/calculus/desolvers.py
2+
index 7f6ba7967e1..89a56cb54e1 100644
3+
--- a/src/sage/calculus/desolvers.py
4+
+++ b/src/sage/calculus/desolvers.py
5+
@@ -1621,7 +1621,7 @@ def desolve_odeint_inner(ivar):
6+
assert len(des) == 1
7+
dvar = dvars[0]
8+
de = des[0]
9+
- func = fast_float(de, dvar, ivar)
10+
+ func = lambda y, t: fast_float(de, dvar, ivar)(y.item(), t)
11+
if not compute_jac:
12+
Dfun = None
13+
else:
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: 9 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,11 @@ 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+
# merged/positive review
34+
35+
get_pr 41395 "Fix test failures with pyparsing 3.3"
36+
get_pr 41342 "Fix a test failure with numpy 2.4"
37+
38+
# draft
39+
40+
get_pr 40816 "Meson: Build docs for Maxima as well"

srcpkgs/sagemath/patches/sphinx.patch

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

0 commit comments

Comments
 (0)