Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions srcpkgs/sagemath/patches/40594-Fix_segfault_in_libgap.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py
index 637ef29a6f2..8b5bf5a6d4f 100644
--- a/src/sage/interfaces/maxima_lib.py
+++ b/src/sage/interfaces/maxima_lib.py
@@ -210,7 +210,7 @@
if MAXIMA_SHARE:
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}"
ecl_eval(f'#$file_search_maxima: append(file_search_maxima, ["{MAXIMA_SHARE}/###.{{mac,mc,wxm}}", "{MAXIMA_SHARE}/{import_packages}/###.{{mac,mc,wxm}}"])$')
- ecl_eval(f'#$file_search_lisp: append(file_search_lisp, ["{MAXIMA_SHARE}/###.{{fas,lisp,lsp}}", "{MAXIMA_SHARE}/{import_packages}/###.{{fas,lisp,lsp}}"])$')
+ 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}}"])$')

# Default options set in Maxima
# display2d -- no ascii art output
diff --git a/subprojects/packagefiles/maxima/build/doc/info/meson.build b/subprojects/packagefiles/maxima/build/doc/info/meson.build
new file mode 100644
index 00000000000..e8c69f73526
diff --git a/subprojects/packagefiles/maxima/build/doc/meson.build b/subprojects/packagefiles/maxima/build/doc/meson.build
new file mode 100644
index 00000000000..eba36e4bdc3
diff --git a/subprojects/packagefiles/maxima/build/meson.build b/subprojects/packagefiles/maxima/build/meson.build
new file mode 100644
index 00000000000..4112780103d

This file was deleted.

32 changes: 0 additions & 32 deletions srcpkgs/sagemath/patches/41141-Fix_ipython_9.7.0.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/sage/calculus/desolvers.py b/src/sage/calculus/desolvers.py
index 7f6ba7967e1..89a56cb54e1 100644
--- a/src/sage/calculus/desolvers.py
+++ b/src/sage/calculus/desolvers.py
@@ -1621,7 +1621,7 @@ def desolve_odeint_inner(ivar):
assert len(des) == 1
dvar = dvars[0]
de = des[0]
- func = fast_float(de, dvar, ivar)
+ func = lambda y, t: fast_float(de, dvar, ivar)(y.item(), t)
if not compute_jac:
Dfun = None
else:
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/src/sage/topology/simplicial_set_examples.py b/src/sage/topology/simplicial_set_examples.py
index be7a4084be2..cd69adb9c5a 100644
--- a/src/sage/topology/simplicial_set_examples.py
+++ b/src/sage/topology/simplicial_set_examples.py
@@ -655,7 +655,7 @@ def simplicial_data_from_kenzo_output(filename) -> dict:
sage: S4.homology(reduced=False) # needs pyparsing
{0: Z, 1: 0, 2: 0, 3: 0, 4: Z}
"""
- from pyparsing import OneOrMore, nestedExpr
+ from pyparsing import OneOrMore, nested_expr

with open(filename) as f:
data = f.read()
@@ -675,7 +675,7 @@ def simplicial_data_from_kenzo_output(filename) -> dict:
end = new_dim_idx
if dim == 0:
simplex_string = data[data.find('Vertices :') + len('Vertices :'):end]
- vertices = OneOrMore(nestedExpr()).parseString(simplex_string).asList()[0]
+ vertices = OneOrMore(nested_expr()).parse_string(simplex_string).asList()[0]
for v in vertices:
vertex = AbstractSimplex(0, name=v)
simplex_data[vertex] = None
14 changes: 9 additions & 5 deletions srcpkgs/sagemath/patches/get_patches
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh

version=10.7
version=10.8

URL_BASE_PR="https://github.com/sagemath/sage/pull/"
URL_BASE_COMPARE="https://github.com/sagemath/sage/compare/${version}..."
Expand Down Expand Up @@ -30,7 +30,11 @@ get_pr() {
# run from patches dir
cd $(dirname "$0")

# positive review
get_pr 40594 "Fix segfault in libgap"
get_pr 41021 "Refactor atexit.pyx for python 3.14"
get_pr 41141 "Fix compatibility issue for ipython 9.7.0"
# merged/positive review

get_pr 41395 "Fix test failures with pyparsing 3.3"
get_pr 41342 "Fix a test failure with numpy 2.4"

# draft

get_pr 40816 "Meson: Build docs for Maxima as well"
33 changes: 0 additions & 33 deletions srcpkgs/sagemath/patches/sphinx.patch

This file was deleted.

Loading
Loading