[arch-commits] Commit in sagemath/trunk (5 files)
Date: Monday, May 7, 2018 @ 20:54:10
Author: arojas
Revision: 319415
Fix env patch, update networkx 2 patch
Added:
sagemath/trunk/sagemath-ignore-warnings.patch
(from rev 319414, sagemath/trunk/pari-stackwarn.patch)
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/sagemath-env.patch
sagemath/trunk/sagemath-networkx2.patch
Deleted:
sagemath/trunk/pari-stackwarn.patch
+
PKGBUILD | 14 +++---
pari-stackwarn.patch | 23 ---
sagemath-env.patch | 20 +---
sagemath-ignore-warnings.patch | 25 +
sagemath-networkx2.patch | 10 ++
5 files changed, 59 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-07 20:42:22 UTC (rev 319414)
+++ PKGBUILD2018-05-07 20:54:10 UTC (rev 319415)
@@ -9,7 +9,7 @@
pkgbase=sagemath
pkgname=(sagemath sagemath-jupyter)
pkgver=8.2
-pkgrel=1
+pkgrel=2
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple,
Mathematica, and Matlab"
arch=(x86_64)
url="http://www.sagemath.org";
@@ -36,12 +36,12 @@
mcqd coxeter bliss-graphs tdlib python2-pkgconfig shared_meataxe libfes)
source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz";
sagemath-env.patch package.patch latte-count.patch jupyter-path.patch
sagemath-python3-notebook.patch test-optional.patch
-r-no-readline.patch fes02.patch sagemath-threejs.patch
pari-stackwarn.patch
+r-no-readline.patch fes02.patch sagemath-threejs.patch
sagemath-ignore-warnings.patch
sagemath-detect-igraph.patch sagemath-networkx2.patch
sagemath-scipy-1.0.patch sagemath-lrs.patch
sagemath-singular-4.1.1.patch sagemath-lcalc-c++11.patch
pari-ratpoints.patch::"https://github.com/sagemath/sage/commit/83458400.patch";)
sha256sums=('41ba2c2dde7a02e1bb6880ae875d37ab058567cc26e760efe87eeb12188cd65b'
-'ad1ce89c624b848c5908e34851e4b765d1ba85819bb3626eedfd0cab6157c5e4'
+'6f95ef6960acb3b368bc6245783d88fcadaa63537e1bf9f41d8d91b28e95ddf9'
'c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107'
'0b680e674c11c47afa86162d8b49645620b8912722e08133d23357c29ca9310a'
'2cad308f8adbb6c54e6603fa22b2f0eb60f6f09248d5d015000c3932ac14f646'
@@ -50,9 +50,9 @@
'afd0952b9bb8f52fd428eae36cf719a58ff85a894baae88cbb2124e043768cc7'
'7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94'
'2d13b15ad2d1511bb3d752a261497060a8901882b1c2fa9813219781b7a71d83'
-'eaf252b2c9b397a0db8fb8cbf45f0b56a21910b5f632d59709f41eff30c5eaab'
+'a4a6c87b46ff23b89608aca66d00427334502e8bfb5dfe68b94497d19be1c7ae'
'bfe49f0168fe0824f0eaf4ea793b08d5b3e43c4e3634eb5f664c70644a793a59'
-'54bb6de642cbc07c24904016546f42de5d5aa040e67014884cbfa20e35e52cbd'
+'8253730940687992dd29d90d95bea7e2685bb4854db004090c8196ce92859b64'
'17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a'
'c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c'
'369f1483e0364031d73d43d9e63b7bf2b0929c8a1d470c1596f98f9f1aa80750'
@@ -88,8 +88,8 @@
patch -p1 -i ../sagemath-networkx2.patch
# fix three.js plotting backend
patch -p1 -i ../sagemath-threejs.patch
-# don't show PARI stack size increase warnings during doctesting (Debian)
- patch -p1 -i ../pari-stackwarn.patch
+# don't show PARI stack size increase or GLPK warnings during doctesting
(Debian)
+ patch -p1 -i ../sagemath-ignore-warnings.patch
# remove deprecated scipy parameters
patch -p1 -i ../sagemath-scipy-1.0.patch
# fix build with Singular 4.1.1
Deleted: pari-stackwarn.patch
===
--- pari-stackwarn.patch2018-05-07 20:42:22 UTC (rev 319414)
+++ pari-stackwarn.patch2018-05-07 20:54:10 UTC (rev 319415)
@@ -1,23 +0,0 @@
-Description: Ignore warnings of PARI increasing the stack size when parsing
doctests
- Since we can't patch PARI to not produce the warnings and we don't want to
- patch tons of doctests to expect the warnings, we patch the doctest parser
- to ignore them.
-Author: Tobias Hansen
sage/src/sage/doctest/parsing.py
-+++ sage/src/sage/doctest/parsing.py
-@@ -40,6 +40,7 @@
-
- float_regex = re.compile('\s*([+-]?\s*((\d*\.?\d+)|(\d+\.?))([eE][+-]?\d+)?)')
- optional_regex = re.compile(r'(py2|py3|long time|not implemented|not
tested|known bug)|([^ a-z]\s*optional\s*[:-]*((\s|\w)*))')
-+pari_stack_warning_regex = re.compile(r'\s*\*\*\*.*(Warning: increasing stack
size to )\d+\.')
- find_sage_prompt = re.compile(r"^(\s*)sage: ", re.M)
- find_sage_continuation = re.compile(r"^(\s*)\.\.\.\.:", re.M)
- random_marker = re.compile('.*random', re.I)
-@@ -935,6 +936,7 @@
-
[arch-commits] Commit in sagemath/trunk (5 files)
Date: Sunday, October 11, 2015 @ 21:15:19
Author: arojas
Revision: 143700
Update to 6.9, switch to atlas-lapack
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/env.patch
sagemath/trunk/package.patch
Deleted:
sagemath/trunk/cython-0.23.patch
sagemath/trunk/ipython-4.patch
---+
PKGBUILD | 26 +-
cython-0.23.patch | 16
env.patch |7 ++-
ipython-4.patch | 35 ---
package.patch |2 +-
5 files changed, 16 insertions(+), 70 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-10-11 18:19:06 UTC (rev 143699)
+++ PKGBUILD2015-10-11 19:15:19 UTC (rev 143700)
@@ -8,13 +8,13 @@
# Special thanks to Nareto for moving the compile from the .install to the
PKGBUILD
pkgname=sagemath
-pkgver=6.8
-pkgrel=5
+pkgver=6.9
+pkgrel=1
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple,
Mathematica, and Matlab"
arch=(i686 x86_64)
url="http://www.sagemath.org";
license=(GPL)
-depends=(ipython2 ppl mpfi palp polybori singular libcliquer maxima-ecl gfan
sympow tachyon python2-rpy2
+depends=(ipython2 atlas-lapack ppl mpfi palp brial singular libcliquer
maxima-ecl gfan sympow tachyon python2-rpy2
python2-matplotlib python2-scipy python2-sympy python2-networkx libgap gap
flintqs lcalc lrcalc
eclib gmp-ecm zn_poly gd python2-cvxopt pynac linbox gsl rubiks pari-galdata
pari-seadata-small planarity rankwidth
sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs
sage-data-polytopes_db sage-data-conway_polynomials)
@@ -22,7 +22,7 @@
'sagemath-doc: Documentation and inline help' 'ipython2-notebook: Jupyter
notebook interface' 'mathjax: Jupyter notebook interface'
'coin-or-cbc: COIN backend for numerical computations' 'nauty: for
generating some classes of graphs'
'buckygen: for generating fullerene graphs' 'plantri: for generating some
classes of graphs' 'benzene: for generating fusenes and benzenoids'
- 'modular_decomposition: modular decomposition of graphs'
+ 'modular_decomposition: modular decomposition of graphs' 'ffmpeg: to export
animations to video'
'lrs: Algorithms for linear reverse search used in game theory and for
computing volume of polytopes' 'imagemagick: to show animations'
'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'arb:
floating-point ball arithmetic')
makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja
coin-or-cbc
@@ -34,21 +34,19 @@
# "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2";
"http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2";
'kernel.json'
'anal.h' 'package.patch' 'env.patch' 'paths.patch' 'clean.patch'
'skip-check.patch'
-'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch'
'cython-0.23.patch' 'ipython-4.patch')
-md5sums=('943780ef4460e38f28fefe95e3138981'
+'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch')
+md5sums=('847ad447eaef17b2bc81bb4fae69c190'
'd9a3e113ed147dcee8f89962a8dccd43'
'4cee4f96bcd877587e7efc40c20adba7'
'a906a180d198186a39820b0a2f9a9c63'
- 'f72e544032b1a3f952b7ddafc3a49d63'
- '843a6cc3b17a1850604593813321418e'
+ '9ba81f717ffd4e20b8b2f2a318307488'
+ '5ebdb6e6ac541f040a39f8d3fd9c8ee1'
'fd8e3e07f5b7318e6a7200a3c64f5bc2'
'23e972753be1e5d0f761a7f82a95cebf'
'5947a420a0b1483f0cbc74c76895789b'
'a83a3b1bc7fcb7cbf752a83a8311fc42'
'f333939ea6c41377b66407c81016cee4'
- '4eb23a3c7363258bc9ba764d6e5512ba'
- '1b8dfa047115180aa0afbeaf19d97762'
- '41aa997ad9f00afdc3357b37fc70f0e6')
+ '4eb23a3c7363258bc9ba764d6e5512ba')
prepare(){
cd sage-$pkgver
@@ -64,8 +62,6 @@
patch -p0 -i ../env.patch
# fix paths in python imports
patch -p0 -i ../paths.patch
-# fix cython linking
- sed -e "s| atlas(),||" -i src/sage/misc/cython.py
# don't try to remove installed files
patch -p0 -i ../clean.patch
# skip checking build status
@@ -79,8 +75,6 @@
sed -e 's|graph.hh|bliss/graph.hh|' -i src/sage/graphs/bliss.pyx
# fix opening docs from Jupyter notebook
sed -e "s|SageKernelSpec.identifier()|'SageMath'|g" -i
src/sage/repl/ipython_kernel/kernel.py
-# fix IPython 4 compatibility
- patch -p0 -i ../ipython-4.patch
# Upstream patches
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
@@ -87,8 +81,6 @@
# patch -p0 -i "$srcdir"/fes02.patch
# disable fes module, fails to compile
patch -p0 -i ../disable-fes.patch
-# fix build with cython 0.23
- patch -p1 -i "$srcdir"/cython-0.23.patch
# use python2
sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec
python|exec python2|' -i src/bin/*
Deleted: cython-0.23.patch
===
--- cython-0.23.
[arch-commits] Commit in sagemath/trunk (5 files)
Date: Tuesday, April 14, 2015 @ 22:30:18 Author: arojas Revision: 131363 SageMath 6.6 Modified: sagemath/trunk/PKGBUILD sagemath/trunk/c_lib.patch Deleted: sagemath/trunk/ChangeLog sagemath/trunk/ipython3.patch sagemath/trunk/tests_parallel.patch --+ ChangeLog| 11 PKGBUILD | 67 c_lib.patch |9 ipython3.patch |11325 - tests_parallel.patch | 14 5 files changed, 32 insertions(+), 11394 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 131362:131363 to see the changes.
