Date: Saturday, March 26, 2016 @ 00:38:56 Author: arojas Revision: 168407
Update to 7.1 Modified: sagemath/trunk/PKGBUILD sagemath/trunk/env.patch sagemath/trunk/paths.patch Deleted: sagemath/trunk/contour.patch ---------------+ PKGBUILD | 33 +++++++++++++-------------------- contour.patch | 11 ----------- env.patch | 28 +++++++++++++++++++--------- paths.patch | 8 +++++--- 4 files changed, 37 insertions(+), 43 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-03-25 23:05:08 UTC (rev 168406) +++ PKGBUILD 2016-03-25 23:38:56 UTC (rev 168407) @@ -8,47 +8,44 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sagemath -pkgver=7.0 -pkgrel=6 +pkgver=7.1 +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 atlas-lapack ppl mpfi palp brial singular cliquer maxima-ecl gfan sympow tachyon python2-rpy2 +depends=(ipython2 cysignals ppl mpfi palp brial singular cliquer maxima-ecl gfan sympow tachyon python2-rpy2 nauty python2-matplotlib python2-scipy python2-sympy python2-networkx python2-igraph libgap flintqs lcalc lrcalc lrs arb 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) optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface' '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' + 'coin-or-cbc: COIN backend for numerical computations' 'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids' 'modular_decomposition: modular decomposition of graphs' 'ffmpeg: to export animations to video' 'imagemagick: to show animations' 'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'gap-data: for computing Galois groups' - 'jupyter-notebook: Jupyter notebook interface') -makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc - mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib) # libfes + 'jupyter-notebook: Jupyter notebook interface' 'atlas-lapack: improved performance for some linear algebra operations') +makedepends=(cython2-devel boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc + mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib meataxe python2-pkgconfig) # libfes conflicts=(sage-mathematics) replaces=(sage-mathematics) provides=(sage-mathematics) source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"; pexpect.zip::"https://github.com/pexpect/pexpect/archive/524495960dd8898ddd30f7ba37298de51beee773.zip"; - ntl-no-legacy-mulmod.patch::"http://git.sagemath.org/sage.git/patch/?id=0d8435cdf"; anal.h package.patch env.patch paths.patch clean.patch skip-check.patch - disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch contour.patch) -md5sums=('34807a7cf5dd79c008abd377ba1427fa' + disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch) +md5sums=('c68e846444b9370fe79f43395cdc2725' 'a346bb2c0350c1cb17d5325235c5e38a' - '8cd491caa5a574fb6348a02715151855' 'a906a180d198186a39820b0a2f9a9c63' '9ba81f717ffd4e20b8b2f2a318307488' - 'e1b1d0d2e6b187309ae2b74489356b9a' - 'fd8e3e07f5b7318e6a7200a3c64f5bc2' + '9e5b8b4f3ce28f51999ce0dd8c9358e7' + '1a60304525ac5a5f45114cc704807894' '6d9ae0978ce6a05a0da2cafdfb178a09' '5947a420a0b1483f0cbc74c76895789b' '4eb23a3c7363258bc9ba764d6e5512ba' '16b529194c6105c3364127bd8f1efa83' 'cdcabd475b80afe0534a5621e972736e' - 'ef927896f2071b442b1d07d7e69f5f3a' - '930cb987f63fd465a3a7123b0f5c2b85') + 'ef927896f2071b442b1d07d7e69f5f3a') prepare(){ cd sage-$pkgver @@ -81,8 +78,6 @@ patch -p0 -i ../jupyter-path.patch # fix timeit with Python 2.7.11 patch -p0 -i ../python-2.7.11.patch -# fix contour plots with matplotlib 1.5.1 - patch -p0 -i ../contour.patch # Upstream patches # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209 @@ -89,8 +84,6 @@ # patch -p0 -i ../fes02.patch # disable fes module, fails to compile patch -p0 -i ../disable-fes.patch -# port away from deprecated NTL API http://trac.sagemath.org/19874 - patch -p1 -i ../ntl-no-legacy-mulmod.patch # use python2 sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/* @@ -137,7 +130,7 @@ mkdir -p "$pkgdir"/usr/bin cp bin/sage "$pkgdir"/usr/bin - for _i in arch-env banner cachegrind callgrind cleaner coverage coverageall CSI CSI-helper.py cython env eval grep grepdoc inline-fortran ipython \ + for _i in arch-env banner cachegrind callgrind cleaner coverage coverageall cython env eval grep grepdoc inline-fortran ipython \ massif maxima.lisp native-execute notebook num-threads.py omega open preparse python rst2sws rst2txt run run-cython runtests startuptime.py \ sws2rst valgrind version.sh do Deleted: contour.patch =================================================================== --- contour.patch 2016-03-25 23:05:08 UTC (rev 168406) +++ contour.patch 2016-03-25 23:38:56 UTC (rev 168407) @@ -1,11 +0,0 @@ ---- src/sage/plot/contour_plot.py.orig 2016-01-20 15:01:00.077409793 +0100 -+++ src/sage/plot/contour_plot.py 2016-01-20 15:01:22.591370847 +0100 -@@ -568,7 +568,7 @@ - g.add_primitive(ContourPlot(xy_data_array, xrange, yrange, options)) - return g - --@options(plot_points=150, contours=(0,0), fill=False, cmap=["blue"]) -+@options(plot_points=150, contours=(0,1e-20), fill=False, cmap=["blue"]) - def implicit_plot(f, xrange, yrange, **options): - r""" - ``implicit_plot`` takes a function of two variables, `f(x,y)` Modified: env.patch =================================================================== --- env.patch 2016-03-25 23:05:08 UTC (rev 168406) +++ env.patch 2016-03-25 23:38:56 UTC (rev 168407) @@ -43,7 +43,7 @@ # Don't execute the commands more than once for the same version of # sage-env. Check this after checking the validity of SAGE_ROOT, but -@@ -245,20 +211,12 @@ +@@ -245,21 +211,13 @@ fi # Setting Sage-related location environment variables. @@ -54,7 +54,8 @@ -export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed" -export SAGE_LOGS="$SAGE_ROOT/logs/pkgs" -export SAGE_SRC="$SAGE_ROOT/src" --export SAGE_DOC="$SAGE_SRC/doc" +-export SAGE_DOC_SRC="$SAGE_SRC/doc" +-export SAGE_DOC="$SAGE_SHARE/doc/sage" - -if [ -z "${SAGE_ORIG_PATH_SET}" ]; then - SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH @@ -66,7 +67,8 @@ +export SAGE_SHARE="$SAGE_LOCAL/share/sage" +export SAGE_EXTCODE="$SAGE_SHARE/ext" +export SAGE_SRC="$SAGE_SHARE/source" -+export SAGE_DOC="/usr/share/doc/sage" ++export SAGE_DOC_SRC="$SAGE_SRC/doc" ++export SAGE_DOC="$SAGE_SHARE/doc/sage" # We offer a toolchain option, so if $SAGE_LOCAL/toolchain/toolchain-env exists source it. # Since the user might do something crazy we do not do any checks, but hope for the best. @@ -80,7 +82,7 @@ if [ -z "$SAGE_REPO_ANONYMOUS" ]; then SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git" export SAGE_REPO_ANONYMOUS -@@ -363,30 +318,17 @@ +@@ -363,38 +318,30 @@ export SAGE_STARTUP_FILE fi @@ -95,6 +97,19 @@ export PYTHON_EGG_CACHE fi + # Set PYTHONUSERBASE to avoid picking up non-Sage versions of + # Matplotlib, numpy, etc. See http://trac.sagemath.org/ticket/19612. + # + # For more history (it used to be PYTHONNOUSERSITE=yes which killed + # the ability to do "sage -pip install PACKAGE --user"), see + # http://trac.sagemath.org/ticket/14243 and + # http://trac.sagemath.org/ticket/18955. + + if [ "$PYTHONUSERBASE" = "" ]; then + PYTHONUSERBASE="$DOT_SAGE/local" + export PYTHONUSERBASE + fi + -if [ -d "$SAGE_LOCAL/lib/python" ]; then - PYTHONPATH="$SAGE_LOCAL/lib/python:$SAGE_LOCAL/lib/python/site_packages" - if [ -n "$SAGE_PATH" ]; then @@ -101,13 +116,8 @@ - PYTHONPATH="$SAGE_PATH:$PYTHONPATH" - fi - PYTHONHOME="$SAGE_LOCAL" -- # Set PYTHONNOUSERSITE to avoid picking up non-Sage versions of -- # Matplotlib, numpy, etc. See http://trac.sagemath.org/ticket/14243 -- # and http://trac.sagemath.org/ticket/18955. -- PYTHONNOUSERSITE=yes - export PYTHONPATH - export PYTHONHOME -- export PYTHONNOUSERSITE -fi +PYTHONPATH="/usr/lib/sage/site-packages:$PYTHONPATH" +PYTHONHOME="$SAGE_ROOT" Modified: paths.patch =================================================================== --- paths.patch 2016-03-25 23:05:08 UTC (rev 168406) +++ paths.patch 2016-03-25 23:38:56 UTC (rev 168407) @@ -1,6 +1,6 @@ --- src/sage/env.py.orig 2014-06-25 10:47:25.827203554 +1200 +++ src/sage/env.py 2014-06-25 10:49:07.667402821 +1200 -@@ -87,24 +87,21 @@ +@@ -87,25 +87,22 @@ _add_variable_or_fallback('LOCAL_IDENTIFIER','$HOSTNAME.%s'%os.getpid()) # bunch of sage directories and files @@ -25,11 +25,13 @@ -_add_variable_or_fallback('SAGE_EXTCODE', opj('$SAGE_SHARE', 'sage', 'ext')) -_add_variable_or_fallback('SAGE_LOGS', opj('$SAGE_ROOT', 'logs', 'pkgs')) -_add_variable_or_fallback('SAGE_SPKG_INST', opj('$SAGE_LOCAL', 'var', 'lib', 'sage', 'installed')) --_add_variable_or_fallback('SAGE_DOC', opj('$SAGE_SRC', 'doc')) +-_add_variable_or_fallback('SAGE_DOC_SRC', opj('$SAGE_SRC', 'doc')) +-_add_variable_or_fallback('SAGE_DOC', opj('$SAGE_SHARE', 'doc', 'sage')) -_add_variable_or_fallback('DOT_SAGE', opj(os.environ.get('HOME','$SAGE_ROOT'), '.sage')) -_add_variable_or_fallback('SAGE_DOT_GIT', opj('$SAGE_ROOT', '.git')) +_add_variable_or_fallback('SAGE_EXTCODE', opj('$SAGE_SHARE', 'ext')) -+_add_variable_or_fallback('SAGE_DOC', '/usr/share/doc/sage') ++_add_variable_or_fallback('SAGE_DOC_SRC', opj('$SAGE_SRC', 'doc')) ++_add_variable_or_fallback('SAGE_DOC', opj('$SAGE_SHARE', 'doc', 'sage')) +_add_variable_or_fallback('DOT_SAGE', opj(os.environ.get('HOME'), '.sage')) _add_variable_or_fallback('SAGE_DISTFILES', opj('$SAGE_ROOT', 'upstream'))
