Skip to content

Commit 2e49a9e

Browse files
committed
sagemath: update to 10.8.
1 parent 7effc39 commit 2e49a9e

File tree

6 files changed

+56
-284
lines changed

6 files changed

+56
-284
lines changed

srcpkgs/sagemath/patches/40594-Fix_segfault_in_libgap.patch

Lines changed: 0 additions & 51 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/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py
2+
index 760c15ecc5b..9e635a36570 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

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.

srcpkgs/sagemath/patches/sphinx.patch

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

srcpkgs/sagemath/template

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,62 @@
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-
hostmakedepends="pkg-config python3-Cython python3-Jinja2
9-
python3-pkgconfig python3-setuptools python3-wheel
10-
python3-gmpy2 python3-memory_allocator python3-numpy ecl
11-
python3-cypari2 python3-cysignals python3-devel"
8+
make_build_args="-C setup-args=-Dbuild-docs=false"
9+
hostmakedepends="pkg-config
10+
python3-Jinja2 python3-pkgconfig python3-setuptools
11+
python3-wheel python3-meson-python"
1212
makedepends="boost-headers brial-devel cliquer-devel ecl eclib-devel
1313
ecm-devel fflas-ffpack flintlib-devel gap-devel gd-devel glpk-devel
1414
gsl-devel iml-devel lcalc-devel libbraiding-devel libhomfly-devel libmpc-devel
1515
libpng-devel linbox-devel m4ri-devel m4rie-devel mpfi-devel
16-
mpfr-devel ntl-devel openblas-devel pari-devel planarity-devel python3-cypari2
17-
python3-cysignals python3-devel python3-gmpy2 python3-memory_allocator
18-
python3-numpy rankwidth-devel singular symmetrica-devel"
19-
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-
mpfr-devel nauty ntl-devel palp pari-devel pari-elldata-small pari-galdata
22-
pari-galpol-small pari-seadata-small pkg-config python3-Cython python3-cypari2
23-
python3-cysignals python3-devel python3-fpylll python3-ipython python3-lrcalc
16+
mpfr-devel ntl-devel openblas-devel pari-devel planarity-devel
17+
singular symmetrica-devel rankwidth-devel
18+
maxima-ecl maxima-src nauty gfan gcc-fortran palp
19+
sympow tachyon threejs-sage
20+
pari-elldata-small pari-galdata
21+
pari-galpol-small pari-seadata-small
22+
sage-data-combinatorial_designs
23+
sage-data-combinatorial_designs
24+
sage-data-elliptic_curves
25+
sage-data-graphs
26+
sage-data-polytopes_db
27+
python3-cypari2 python3-cysignals python3-devel python3-gmpy2
28+
python3-memory_allocator python3-numpy python3-Cython
29+
python3-fpylll python3-ipython python3-lrcalc
2430
python3-ipython_ipykernel python3-jupyter_ipywidgets python3-matplotlib
25-
python3-memory_allocator python3-networkx python3-pip python3-pkgconfig
31+
python3-networkx python3-pip
2632
python3-pplpy python3-primecountpy python3-requests python3-scipy
27-
python3-sympy python3-traitlets sage-data-combinatorial_designs
28-
python3-conway-polynomials sage-data-elliptic_curves sage-data-graphs
29-
sage-data-polytopes_db sympow tachyon threejs-sage
30-
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"
33+
python3-sympy python3-traitlets
34+
python3-conway-polynomials
35+
python3-six python3-pexpect python3-Sphinx
36+
python3-Pillow python3-mpmath python3-jupyter_client python3-ptyprocess
37+
python3-platformdirs python3-pytest"
38+
depends="gzip
39+
python3-Cython python3-Pillow python3-Sphinx python3-conway-polynomials
40+
python3-cypari2 python3-cysignals python3-fpylll python3-gmpy2
41+
python3-ipython python3-ipython_ipykernel python3-jupyter_client
42+
python3-jupyter_ipywidgets python3-matplotlib python3-memory_allocator
43+
python3-mpmath python3-networkx python3-numpy python3-pexpect
44+
python3-pkgconfig python3-platformdirs python3-pplpy python3-primecountpy
45+
python3-ptyprocess python3-requests python3-scipy python3-six
46+
python3-sympy python3-traitlets
47+
python3-lrcalc"
48+
checkdepends="${depends} python3-pytest pythran gdb"
3349
short_desc="Open source mathematics software"
3450
maintainer="Gonzalo Tornaría <[email protected]>"
3551
license="GPL-2.0-or-later"
3652
homepage="https://www.sagemath.org/"
3753
changelog="https://github.com/sagemath/sage/releases"
38-
distfiles="${PYPI_SITE}/s/sagemath-standard/sagemath_standard-${_pypi_version}.tar.gz"
39-
checksum=f6ec41913a745b94e20ceae69c2c54a7c8e549b3dc8b4a01dbd874c772924149
54+
distfiles="${PYPI_SITE}/s/sagemath/sagemath-${_pypi_version}.tar.gz"
55+
checksum=864c21a84bfad05f586ccdc45bf685552cd87a236bf56bc30163de474569f82c
4056
nocross="due to ntl (eclib, singular), fflas-ffpack, givaro, linbox, sympow, maxima"
4157

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

4861
post_install() {
4962
# move scripts to /usr/libexec
@@ -74,16 +87,16 @@ do_check() {
7487
fi
7588
cp ${FILESDIR}/timings2.json .
7689
_test_args="--stats_path=timings2.json"
77-
if [ "$XBPS_CHECK_PKGS" = full ]; then
90+
if [ "${XBPS_CHECK_PKGS}" = full ]; then
7891
_test_args+=" --long --warn-long 30.0"
7992
else
8093
_test_args+=" --warn-long 10.0"
8194
fi
82-
if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
95+
if [ "${XBPS_BUILD_ENVIRONMENT}" = "void-packages-ci" ]; then
8396
# for CI use a predictable random seed
8497
_test_args+=" --random-seed=0"
8598
fi
8699

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

0 commit comments

Comments
 (0)