[arch-commits] Commit in sagemath/trunk (8 files)
Antonio Rojas
arojas at archlinux.org
Thu Aug 4 23:01:39 UTC 2016
Date: Thursday, August 4, 2016 @ 23:01:39
Author: arojas
Revision: 185158
Update to 7.3
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/disable-fes.patch
sagemath/trunk/env.patch
sagemath/trunk/is-package-installed.patch
sagemath/trunk/linbox-1.4.patch
sagemath/trunk/paths.patch
sagemath/trunk/sagemath-ipython5.patch
sagemath/trunk/skip-check.patch
----------------------------+
PKGBUILD | 30 ++++++++++-------------
disable-fes.patch | 6 ++--
env.patch | 4 +--
is-package-installed.patch | 56 +++++++++++++++++++++----------------------
linbox-1.4.patch | 50 +++++++++++++++++++-------------------
paths.patch | 37 +++++++++++-----------------
sagemath-ipython5.patch | 8 +++---
skip-check.patch | 7 +++--
8 files changed, 95 insertions(+), 103 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-04 22:29:15 UTC (rev 185157)
+++ PKGBUILD 2016-08-04 23:01:39 UTC (rev 185158)
@@ -8,8 +8,8 @@
# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
pkgname=sagemath
-pkgver=7.2
-pkgrel=9
+pkgver=7.3
+pkgrel=1
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
arch=(i686 x86_64)
url="http://www.sagemath.org"
@@ -26,9 +26,10 @@
'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'
'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes'
- 'python2-igraph: igraph backend for graph theory'
- 'jupyter-notebook: Jupyter notebook interface' 'atlas-lapack: improved performance for some linear algebra operations')
-makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc
+ 'libhomfly: for computing the homfly polynomial of links' 'libbraiding: for computing in braid groups'
+ 'python2-igraph: igraph backend for graph theory' 'sage-notebook-export: convert flask notebooks to jupyter'
+ 'jupyter-notebook: Jupyter notebook interface')
+makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc libhomfly libbraiding
mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe) # libfes
conflicts=(sage-mathematics)
replaces=(sage-mathematics)
@@ -36,22 +37,22 @@
source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
anal.h env.patch paths.patch clean.patch skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch
disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch linbox-1.4.patch ecm-7.patch sagemath-ipython5.patch)
-md5sums=('2afeb8f75a33107fef5d509698c0eabc'
+md5sums=('cb2aed3d24de7b2228a9b34e81a27870'
'a906a180d198186a39820b0a2f9a9c63'
- 'f6c62f0ccc168c5e6e3dd9d6f73f6389'
- '52d30e91110183489f66d7bf73c36c64'
+ '4c8ddf07861abe703816e045e9e22de0'
+ '6f4dd6ec97affa2ce9a00ddf7e35db4c'
'6d9ae0978ce6a05a0da2cafdfb178a09'
- '5947a420a0b1483f0cbc74c76895789b'
+ '6cafcb381437d4751fd55b25d5090987'
'a1bcdd3fe620dbae60ed8b0e98b2ece7'
- '541988696465f204235d595a349017f3'
+ 'b3ecf7c93a90e0afccbc686af9fdc85f'
'9ba81f717ffd4e20b8b2f2a318307488'
- '4eb23a3c7363258bc9ba764d6e5512ba'
+ '06a67e611d10aa2381efe1f08ea4ffd9'
'16b529194c6105c3364127bd8f1efa83'
'cdcabd475b80afe0534a5621e972736e'
'ef927896f2071b442b1d07d7e69f5f3a'
- '9f1cef3e477bafebe2ad301db56db8a2'
+ 'a276f0fbbff6eade409d0569ebd728d4'
'0c9a57d35de80c2cd418ebec912efbbb'
- '55e75afd249048a8718c4377c22afa52')
+ 'abf4a70811d4f19191348202a923fe4b')
prepare(){
cd sage-$pkgver
@@ -108,9 +109,6 @@
# copy required private PARI header
mkdir -p src/pari
cp "$srcdir"/anal.h src/pari/anal.h
-
-# remove developer interface
- rm -r src/sage/dev
}
Modified: disable-fes.patch
===================================================================
--- disable-fes.patch 2016-08-04 22:29:15 UTC (rev 185157)
+++ disable-fes.patch 2016-08-04 23:01:39 UTC (rev 185158)
@@ -1,8 +1,8 @@
--- src/module_list.py.orig 2015-06-07 11:29:30.710612146 +0200
+++ src/module_list.py 2015-06-07 11:30:21.877506106 +0200
-@@ -685,11 +685,11 @@
- include_dirs = [SAGE_INC + '/ecl'],
- depends = [SAGE_INC + '/ecl/ecl.h']),
+@@ -564,11 +564,11 @@
+ sources = ["sage/libs/ecl.pyx"],
+ libraries = ["ecl"]),
- OptionalExtension("sage.libs.fes",
- ["sage/libs/fes.pyx"],
Modified: env.patch
===================================================================
--- env.patch 2016-08-04 22:29:15 UTC (rev 185157)
+++ env.patch 2016-08-04 23:01:39 UTC (rev 185158)
@@ -135,9 +135,9 @@
fi
-MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
-
+ PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB
+
############ architecture flags
-
- # Support flags to change the build architecture. Currently, this is
@@ -602,9 +547,6 @@
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
fi
Modified: is-package-installed.patch
===================================================================
--- is-package-installed.patch 2016-08-04 22:29:15 UTC (rev 185157)
+++ is-package-installed.patch 2016-08-04 23:01:39 UTC (rev 185158)
@@ -2,15 +2,15 @@
index 0a5f794..2969d92 100644
--- a/src/sage/databases/cremona.py
+++ b/src/sage/databases/cremona.py
-@@ -52,7 +52,6 @@ from sage.misc.prandom import randint
+@@ -53,7 +53,6 @@ from sage.misc.prandom import randint
import sage.schemes.elliptic_curves.constructor as elliptic
- from sql_db import SQLDatabase, verify_column
+ from .sql_db import SQLDatabase, verify_column
-from sage.misc.package import is_package_installed
from sage.env import SAGE_SHARE
from sage.misc.all import walltime
-@@ -827,7 +826,7 @@ class MiniCremonaDatabase(SQLDatabase):
+@@ -828,7 +827,7 @@ class MiniCremonaDatabase(SQLDatabase):
if N < self.largest_conductor():
message = "There is no elliptic curve with label " + label \
+ " in the database"
@@ -19,7 +19,7 @@
message = "There is no elliptic curve with label " + label \
+ " in the currently available databases"
else:
-@@ -1676,7 +1675,7 @@ def CremonaDatabase(name=None,mini=None,set_global=None):
+@@ -1677,7 +1676,7 @@ def CremonaDatabase(name=None,mini=None,set_global=None):
if name is None and not set_global:
return _db
if set_global and name is None:
@@ -32,7 +32,7 @@
index b917d2a..80fb20c 100644
--- a/src/sage/game_theory/normal_form_game.py
+++ b/src/sage/game_theory/normal_form_game.py
-@@ -612,8 +612,9 @@ from sage.rings.all import QQ
+@@ -614,8 +614,9 @@ from sage.rings.all import QQ
from sage.structure.sage_object import SageObject
from sage.matrix.constructor import matrix
from sage.matrix.constructor import vector
@@ -43,7 +43,7 @@
try:
from gambit import Game
-@@ -1315,13 +1316,13 @@ class NormalFormGame(SageObject, MutableMapping):
+@@ -1317,13 +1318,13 @@ class NormalFormGame(SageObject, MutableMapping):
raise ValueError("utilities have not been populated")
if not algorithm:
@@ -63,7 +63,7 @@
index 2f58d8b..eb519a2 100644
--- a/src/sage/geometry/polyhedron/base.py
+++ b/src/sage/geometry/polyhedron/base.py
-@@ -20,7 +20,6 @@ import six
+@@ -21,7 +21,6 @@ import six
from sage.structure.element import Element, coerce_binop, is_Vector
from sage.misc.all import cached_method, prod
@@ -71,7 +71,7 @@
from sage.rings.all import QQ, ZZ
from sage.rings.real_double import RDF
-@@ -3690,7 +3689,9 @@ class Polyhedron_base(Element):
+@@ -3691,7 +3690,9 @@ class Polyhedron_base(Element):
David Avis's lrs program.
"""
@@ -103,7 +103,7 @@
index 252984f..ce19682 100644
--- a/src/sage/graphs/generic_graph.py
+++ b/src/sage/graphs/generic_graph.py
-@@ -7833,7 +7833,6 @@ class GenericGraph(GenericGraph_pyx):
+@@ -7856,7 +7856,6 @@ class GenericGraph(GenericGraph_pyx):
sage: abs(flow_ff-flow_igraph) < 0.00001 # optional python_igraph
True
"""
@@ -111,7 +111,7 @@
self._scream_if_not_simple(allow_loops=True)
if vertex_bound and algorithm in ["FF", "igraph"]:
raise ValueError("This method does not support both " +
-@@ -7851,10 +7850,12 @@ class GenericGraph(GenericGraph_pyx):
+@@ -7874,10 +7873,12 @@ class GenericGraph(GenericGraph_pyx):
if algorithm is None:
if vertex_bound:
algorithm = "LP"
@@ -127,7 +127,7 @@
if (algorithm == "FF"):
return self._ford_fulkerson(x,y, value_only=value_only, integer=integer, use_edge_labels=use_edge_labels)
-@@ -20134,17 +20135,22 @@ class GenericGraph(GenericGraph_pyx):
+@@ -20251,17 +20252,22 @@ class GenericGraph(GenericGraph_pyx):
Subgroup of (Permutation Group with generators [(0,7)(1,4)(2,3)(6,8)]) generated by [(0,7)(1,4)(2,3)(6,8)]]
"""
@@ -156,7 +156,7 @@
A = automorphism_group(self, partition)
-@@ -20786,17 +20792,22 @@ class GenericGraph(GenericGraph_pyx):
+@@ -20903,17 +20909,22 @@ class GenericGraph(GenericGraph_pyx):
True
"""
@@ -189,7 +189,7 @@
index 5919ab3..1766796 100644
--- a/src/sage/graphs/graph_generators.py
+++ b/src/sage/graphs/graph_generators.py
-@@ -1192,8 +1192,9 @@ class GraphGenerators():
+@@ -1195,8 +1195,9 @@ class GraphGenerators():
.. [buckygen] \G. Brinkmann, J. Goedgebeur and B.D. McKay, Generation of Fullerenes,
Journal of Chemical Information and Modeling, 52(11):2910-2918, 2012.
"""
@@ -201,7 +201,7 @@
raise TypeError("the optional buckygen package is not installed")
# number of vertices should be positive
-@@ -1277,8 +1278,9 @@ class GraphGenerators():
+@@ -1280,8 +1281,9 @@ class GraphGenerators():
.. [benzene] \G. Brinkmann, G. Caporossi and P. Hansen, A Constructive Enumeration of Fusenes and Benzenoids,
Journal of Algorithms, 45:155-166, 2002.
"""
@@ -213,7 +213,7 @@
raise TypeError("the optional benzene package is not installed")
# number of hexagons should be positive
-@@ -1430,8 +1432,9 @@ class GraphGenerators():
+@@ -1433,8 +1435,9 @@ class GraphGenerators():
.. [plantri] \G. Brinkmann and B.D. McKay, Fast generation of planar graphs,
MATCH-Communications in Mathematical and in Computer Chemistry, 58(2):323-357, 2007.
"""
@@ -225,7 +225,7 @@
raise TypeError("the optional plantri package is not installed")
# number of vertices should be positive
-@@ -1629,8 +1632,9 @@ class GraphGenerators():
+@@ -1632,8 +1635,9 @@ class GraphGenerators():
sage: [g.size() for g in graphs.triangulations(6, minimum_connectivity=3)] # optional plantri
[12, 12]
"""
@@ -237,7 +237,7 @@
raise TypeError("the optional plantri package is not installed")
# number of vertices should be positive
-@@ -1783,8 +1787,9 @@ class GraphGenerators():
+@@ -1786,8 +1790,9 @@ class GraphGenerators():
sage: [len(g) for g in graphs.quadrangulations(12, no_nonfacial_quadrangles=True, dual=True)] # optional plantri
[10, 10]
"""
@@ -293,7 +293,7 @@
index e42db61..d4d5684 100644
--- a/src/sage/groups/perm_gps/permgroup.py
+++ b/src/sage/groups/perm_gps/permgroup.py
-@@ -143,7 +143,6 @@ from sage.groups.perm_gps.permgroup_element import PermutationGroupElement, stan
+@@ -145,7 +145,6 @@ from sage.groups.perm_gps.permgroup_element import PermutationGroupElement, stan
from sage.groups.abelian_gps.abelian_group import AbelianGroup
from sage.misc.cachefunc import cached_method
from sage.groups.class_function import ClassFunction
@@ -301,7 +301,7 @@
from sage.sets.finite_enumerated_set import FiniteEnumeratedSet
from sage.categories.all import FiniteEnumeratedSets
from sage.groups.conjugacy_classes import ConjugacyClassGAP
-@@ -188,8 +187,6 @@ def hap_decorator(f):
+@@ -190,8 +189,6 @@ def hap_decorator(f):
"""
@wraps(f)
def wrapped(self, n, p=0):
@@ -310,7 +310,7 @@
load_hap()
from sage.arith.all import is_prime
if not (p == 0 or is_prime(p)):
-@@ -1681,9 +1678,7 @@ class PermutationGroup_generic(group.FiniteGroup):
+@@ -1683,9 +1680,7 @@ class PermutationGroup_generic(group.FiniteGroup):
try:
return [Integer(n) for n in self._gap_().IdGroup()]
except RuntimeError:
@@ -321,7 +321,7 @@
def id(self):
"""
-@@ -1734,9 +1729,7 @@ class PermutationGroup_generic(group.FiniteGroup):
+@@ -1736,9 +1731,7 @@ class PermutationGroup_generic(group.FiniteGroup):
try:
return Integer(self._gap_().PrimitiveIdentification())
except RuntimeError:
@@ -332,7 +332,7 @@
def center(self):
"""
-@@ -4112,8 +4105,6 @@ class PermutationGroup_generic(group.FiniteGroup):
+@@ -4114,8 +4107,6 @@ class PermutationGroup_generic(group.FiniteGroup):
- David Joyner and Graham Ellis
"""
@@ -345,16 +345,16 @@
index 90e6985..21daeb0 100644
--- a/src/sage/misc/all.py
+++ b/src/sage/misc/all.py
-@@ -52,11 +52,6 @@ from fpickle import pickle_function, unpickle_function
+@@ -53,11 +53,6 @@ from fpickle import pickle_function, unpickle_function
- from dist import install_scripts
+ from .dist import install_scripts
--from package import (install_package,
+-from .package import (install_package,
- installed_packages, is_package_installed,
- standard_packages, optional_packages, experimental_packages,
- upgrade, package_versions)
-
- from pager import pager
+ from .pager import pager
lazy_import('sage.misc.sagedoc', ['browse_sage_doc',
diff --git a/src/sage/rings/polynomial/multi_polynomial_sequence.py b/src/sage/rings/polynomial/multi_polynomial_sequence.py
@@ -361,7 +361,7 @@
index da41cb0..49cae0b 100644
--- a/src/sage/rings/polynomial/multi_polynomial_sequence.py
+++ b/src/sage/rings/polynomial/multi_polynomial_sequence.py
-@@ -158,7 +158,6 @@ from sage.misc.cachefunc import cached_method
+@@ -159,7 +159,6 @@ from sage.misc.cachefunc import cached_method
from types import GeneratorType
from sage.misc.converting_dict import KeyConvertingDict
@@ -369,7 +369,7 @@
from sage.structure.sequence import Sequence, Sequence_generic
-@@ -1428,10 +1427,11 @@ class PolynomialSequence_gf2(PolynomialSequence_generic):
+@@ -1429,10 +1428,11 @@ class PolynomialSequence_gf2(PolynomialSequence_generic):
if S != []:
if algorithm == "exhaustive_search":
Modified: linbox-1.4.patch
===================================================================
--- linbox-1.4.patch 2016-08-04 22:29:15 UTC (rev 185157)
+++ linbox-1.4.patch 2016-08-04 23:01:39 UTC (rev 185158)
@@ -53,7 +53,7 @@
)
#########################################################
-@@ -85,12 +112,6 @@ except ValueError:
+@@ -91,12 +118,6 @@ except ValueError:
singular_libs = ['singular', 'flint', 'ntl', 'gmpxx', 'gmp', 'readline', 'm']
#########################################################
@@ -66,7 +66,7 @@
### Library order
#########################################################
-@@ -105,8 +126,7 @@ givaro_extra_compile_args =['-D__STDC_LIMIT_MACROS']
+@@ -111,8 +132,7 @@ givaro_extra_compile_args =['-D__STDC_LIMIT_MACROS']
# at the very end of the list.
library_order_list = [
"singular", "ec", "ecm",
@@ -75,8 +75,8 @@
+] + linbox_libs + gsl_libs + [
"pari", "flint", "ratpoints", "ecl", "glpk", "ppl",
"arb", "fplll", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
- "polybori",
-@@ -593,13 +613,10 @@ ext_modules = [
+ "brial",
+@@ -611,13 +631,10 @@ ext_modules = [
Extension('sage.libs.linbox.linbox',
sources = ['sage/libs/linbox/linbox.pyx'],
@@ -92,7 +92,7 @@
Extension('sage.libs.lcalc.lcalc_Lfunction',
sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
-@@ -645,9 +662,8 @@ ext_modules = [
+@@ -665,9 +682,8 @@ ext_modules = [
Extension('sage.libs.singular.singular',
sources = ['sage/libs/singular/singular.pyx'],
@@ -104,7 +104,7 @@
Extension('sage.libs.singular.polynomial',
sources = ['sage/libs/singular/polynomial.pyx'],
-@@ -667,8 +683,7 @@ ext_modules = [
+@@ -687,8 +703,7 @@ ext_modules = [
Extension('sage.libs.singular.function',
sources = ['sage/libs/singular/function.pyx'],
libraries = singular_libs,
@@ -114,7 +114,7 @@
Extension('sage.libs.singular.option',
sources = ['sage/libs/singular/option.pyx'],
-@@ -923,19 +938,17 @@ ext_modules = [
+@@ -944,19 +959,17 @@ ext_modules = [
Extension('sage.matrix.matrix_modn_dense_float',
sources = ['sage/matrix/matrix_modn_dense_float.pyx'],
language="c++",
@@ -122,7 +122,7 @@
+ libraries = linbox_libs + cblas_libs,
library_dirs = cblas_library_dirs,
- include_dirs = cblas_include_dirs,
-- extra_compile_args = ['-DDISABLE_COMMENTATOR'] + givaro_extra_compile_args),
+- extra_compile_args = nocxx11_args + ['-DDISABLE_COMMENTATOR'] + givaro_extra_compile_args),
+ include_dirs = cblas_include_dirs),
Extension('sage.matrix.matrix_modn_dense_double',
@@ -132,13 +132,13 @@
+ libraries = linbox_libs + cblas_libs,
library_dirs = cblas_library_dirs,
include_dirs = cblas_include_dirs,
-- extra_compile_args = ["-D_XPG6", "-DDISABLE_COMMENTATOR"]
+- extra_compile_args = nocxx11_args + ["-D_XPG6", "-DDISABLE_COMMENTATOR"]
- + m4ri_extra_compile_args + givaro_extra_compile_args),
+ extra_compile_args = ["-D_XPG6"]),
Extension('sage.matrix.matrix_modn_sparse',
sources = ['sage/matrix/matrix_modn_sparse.pyx']),
-@@ -1374,8 +1387,7 @@ ext_modules = [
+@@ -1400,8 +1413,7 @@ ext_modules = [
Extension('sage.rings.finite_rings.element_givaro',
sources = ["sage/rings/finite_rings/element_givaro.pyx"],
libraries = ['givaro', 'ntl', 'gmpxx', 'gmp', 'm'],
@@ -148,7 +148,7 @@
Extension('sage.rings.finite_rings.element_ntl_gf2e',
sources = ['sage/rings/finite_rings/element_ntl_gf2e.pyx'],
-@@ -1395,8 +1407,7 @@ ext_modules = [
+@@ -1421,8 +1433,7 @@ ext_modules = [
sources = ["sage/rings/finite_rings/hom_finite_field_givaro.pyx"],
# this order is needed to compile under windows.
libraries = ['givaro', 'ntl', 'gmpxx', 'gmp', 'm'],
@@ -158,7 +158,7 @@
################################
##
-@@ -1548,8 +1559,7 @@ ext_modules = [
+@@ -1574,8 +1585,7 @@ ext_modules = [
Extension('sage.rings.polynomial.plural',
sources = ['sage/rings/polynomial/plural.pyx'],
libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'],
@@ -214,7 +214,7 @@
+# distutils: libraries = FFLASFFPACK_LIBRARIES
+# distutils: library_dirs = FFLASFFPACK_LIBDIR
+
- from modular cimport ModDoubleField, ModFloatField, ModDoubleFieldElement, ModFloatFieldElement
+ from .modular cimport ModDoubleField, ModFloatField, ModDoubleFieldElement, ModFloatFieldElement
cdef extern from "fflas-ffpack/fflas-ffpack.h" namespace "std":
diff --git a/src/sage/libs/linbox/linbox.pyx b/src/sage/libs/linbox/linbox.pyx
@@ -264,7 +264,7 @@
index 33d7f7ec..77f6e0a 100644
--- a/src/sage/libs/singular/singular.pyx
+++ b/src/sage/libs/singular/singular.pyx
-@@ -22,6 +22,7 @@ cdef extern from "limits.h":
+@@ -23,6 +23,7 @@ cdef extern from "limits.h":
import os
@@ -272,7 +272,7 @@
from sage.libs.singular.decl cimport intvec
from sage.libs.singular.decl cimport SR_HDL, SR_INT, SR_TO_INT
from sage.libs.singular.decl cimport singular_options, singular_verbose_options
-@@ -155,7 +156,7 @@ cdef FFgivE si2sa_GFqGivaro(number *n, ring *_ring, Cache_givaro cache):
+@@ -156,7 +157,7 @@ cdef FFgivE si2sa_GFqGivaro(number *n, ring *_ring, Cache_givaro cache):
order = cache.objectptr.cardinality() - 1
while z:
@@ -365,7 +365,7 @@
index d32b5cf..f2afa44 100644
--- a/src/sage/rings/finite_rings/element_givaro.pyx
+++ b/src/sage/rings/finite_rings/element_givaro.pyx
-@@ -58,8 +58,9 @@ from sage.misc.randstate cimport randstate, current_randstate
+@@ -59,8 +59,9 @@ from sage.misc.randstate cimport randstate, current_randstate
from sage.rings.finite_rings.finite_field_base cimport FiniteField
from sage.rings.ring cimport Ring
from element_ext_pari import FiniteField_ext_pariElement
@@ -376,7 +376,7 @@
import operator
import sage.arith.all
import finite_field_constructor as finite_field
-@@ -373,18 +374,16 @@ cdef class Cache_givaro(SageObject):
+@@ -374,18 +375,16 @@ cdef class Cache_givaro(SageObject):
elif isinstance(e, int) or \
isinstance(e, Integer) or \
isinstance(e, long) or is_IntegerMod(e):
@@ -399,8 +399,8 @@
elif isinstance(e, str):
return self.parent(eval(e.replace("^","**"),self.parent.gens_dict()))
-@@ -394,8 +393,8 @@ cdef class Cache_givaro(SageObject):
- raise TypeError, "e.parent must match self.vector_space"
+@@ -395,8 +394,8 @@ cdef class Cache_givaro(SageObject):
+ raise TypeError("e.parent must match self.vector_space")
ret = self._zero_element
for i in range(len(e)):
- e_entry = e[i] % self.characteristic()
@@ -410,8 +410,8 @@
to_add = make_FiniteField_givaroElement(self, res)
ret = ret + to_add*self.parent.gen()**i
return ret
-@@ -434,8 +433,8 @@ cdef class Cache_givaro(SageObject):
- raise ValueError, "list is too long"
+@@ -435,8 +434,8 @@ cdef class Cache_givaro(SageObject):
+ raise ValueError("list is too long")
ret = self._zero_element
for i in range(len(e)):
- e_entry = e[i] % self.characteristic()
@@ -421,7 +421,7 @@
to_add = make_FiniteField_givaroElement(self, res)
ret = ret + to_add*self.parent.gen()**i
return ret
-@@ -572,19 +571,17 @@ cdef class Cache_givaro(SageObject):
+@@ -573,19 +572,17 @@ cdef class Cache_givaro(SageObject):
cdef int ret = k.zero
cdef int a = k.indeterminate()
cdef int at = k.one
@@ -431,7 +431,7 @@
+ cdef int t, i
if n<0 or n>k.cardinality():
- raise TypeError, "n must be between 0 and self.order()"
+ raise TypeError("n must be between 0 and self.order()")
- _n = n
-
@@ -449,7 +449,7 @@
index adbaab3..c431f6d 100644
--- a/src/sage/rings/finite_rings/finite_field_givaro.py
+++ b/src/sage/rings/finite_rings/finite_field_givaro.py
-@@ -269,7 +269,8 @@ class FiniteField_givaro(FiniteField):
+@@ -270,7 +270,8 @@ class FiniteField_givaro(FiniteField):
sage: k(2) # indirect doctest
0
@@ -459,7 +459,7 @@
sage: k(float(2.0))
0
-@@ -343,7 +344,7 @@ class FiniteField_givaro(FiniteField):
+@@ -344,7 +345,7 @@ class FiniteField_givaro(FiniteField):
sage: k(pari('Mod(1,2)'))
1
sage: k(pari('Mod(2,3)'))
Modified: paths.patch
===================================================================
--- paths.patch 2016-08-04 22:29:15 UTC (rev 185157)
+++ paths.patch 2016-08-04 23:01:39 UTC (rev 185158)
@@ -1,39 +1,32 @@
--- 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,25 +87,22 @@
- _add_variable_or_fallback('LOCAL_IDENTIFIER','$HOSTNAME.%s'%os.getpid())
+@@ -90,10 +90,10 @@
# bunch of sage directories and files
--_add_variable_or_fallback('SAGE_ROOT', None)
+ _add_variable_or_fallback('SAGE_ROOT', None)
-_add_variable_or_fallback('SAGE_LOCAL', opj('$SAGE_ROOT', 'local'))
-_add_variable_or_fallback('SAGE_ETC', opj('$SAGE_LOCAL', 'etc'))
--_add_variable_or_fallback('SAGE_INC', opj('$SAGE_LOCAL', 'include'))
--_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share'))
-+_add_variable_or_fallback('SAGE_ROOT', '/usr')
+_add_variable_or_fallback('SAGE_LOCAL', '/usr')
+_add_variable_or_fallback('SAGE_ETC', '/etc/sage')
-+_add_variable_or_fallback('SAGE_INC', opj('$SAGE_LOCAL', 'include'))
+ _add_variable_or_fallback('SAGE_INC', opj('$SAGE_LOCAL', 'include'))
+-_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share'))
+_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share', 'sage'))
_add_variable_or_fallback('SAGE_SRC', opj('$SAGE_ROOT', 'src'))
--_add_variable_or_fallback('SITE_PACKAGES', site.getsitepackages())
-+_add_variable_or_fallback('SITE_PACKAGES', site.getsitepackages()+['/usr/lib/sage/site-packages'])
+
+@@ -102,13 +102,13 @@
+ except AttributeError: # in case of use inside virtualenv
+ sitepackages_dirs = [os.path.join(os.path.dirname(site.__file__),
+ 'site-packages')]
+-_add_variable_or_fallback('SITE_PACKAGES', sitepackages_dirs)
++_add_variable_or_fallback('SITE_PACKAGES', sitepackages_dirs + ['/usr/lib/sage/site-packages'])
+
_add_variable_or_fallback('SAGE_LIB', SITE_PACKAGES[0])
_add_variable_or_fallback('SAGE_CYTHONIZED', opj('$SAGE_SRC', 'build', 'cythonized'))
-_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_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_SRC', opj('$SAGE_SRC', 'doc'))
-+_add_variable_or_fallback('SAGE_DOC', opj('/usr/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'))
-
- # misc
-
+ _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_SRC', opj('$SAGE_SRC', 'doc'))
Modified: sagemath-ipython5.patch
===================================================================
--- sagemath-ipython5.patch 2016-08-04 22:29:15 UTC (rev 185157)
+++ sagemath-ipython5.patch 2016-08-04 23:01:39 UTC (rev 185158)
@@ -2,7 +2,7 @@
index ef8724d..6896985 100644
--- a/src/sage/repl/interpreter.py
+++ b/src/sage/repl/interpreter.py
-@@ -103,6 +103,7 @@ import os
+@@ -107,6 +107,7 @@ import os
import re
import sys
from sage.repl.preparse import preparse
@@ -10,7 +10,7 @@
from traitlets.config.loader import Config
from traitlets import Bool, Type
-@@ -371,11 +372,6 @@ class SageTestShell(SageShellOverride, TerminalInteractiveShell):
+@@ -375,11 +376,6 @@ class SageTestShell(SageShellOverride, TerminalInteractiveShell):
###################################################################
DEFAULT_SAGE_CONFIG = Config(
@@ -22,7 +22,7 @@
TerminalIPythonApp = Config(
display_banner = False,
verbose_crash = True,
-@@ -383,6 +379,7 @@ DEFAULT_SAGE_CONFIG = Config(
+@@ -387,6 +383,7 @@ DEFAULT_SAGE_CONFIG = Config(
shell_class = SageTerminalInteractiveShell,
),
InteractiveShell = Config(
@@ -30,7 +30,7 @@
ast_node_interactivity = 'all',
colors = 'LightBG' if sys.stdout.isatty() else 'NoColor',
confirm_exit = False,
-@@ -616,13 +613,11 @@ def interface_shell_embed(interface):
+@@ -620,13 +617,11 @@ def interface_shell_embed(interface):
cfg = copy.deepcopy(get_ipython().config)
except NameError:
cfg = copy.deepcopy(DEFAULT_SAGE_CONFIG)
Modified: skip-check.patch
===================================================================
--- skip-check.patch 2016-08-04 22:29:15 UTC (rev 185157)
+++ skip-check.patch 2016-08-04 23:01:39 UTC (rev 185158)
@@ -1,6 +1,6 @@
--- src/bin/sage.orig 2014-12-18 09:47:27.354829070 +0100
+++ src/bin/sage 2014-12-18 09:48:00.041563401 +0100
-@@ -286,18 +286,6 @@
+@@ -352,18 +352,6 @@
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
@@ -16,6 +16,7 @@
- exit 1
- fi
-
- # Display the startup banner
+ # Display the startup banner (unless SAGE_BANNER is explictly "no")
if [ "$SAGE_BANNER" != "no" ]; then
- cat "$SAGE_LOCAL/bin/sage-banner"
+ # can be 'bare', or 'yes', or unspecified
+
More information about the arch-commits
mailing list