Update to sagemath 6.1.1

This commit is contained in:
pcpa 2014-02-08 15:23:21 -02:00
parent d0a2caf3af
commit 34b5d7d380
30 changed files with 570 additions and 1598 deletions

View file

@ -1,6 +1,6 @@
diff -up sage-5.13/spkg/build/sage-5.13/doc/common/builder.py.orig sage-5.13/spkg/build/sage-5.13/doc/common/builder.py
--- sage-5.13/spkg/build/sage-5.13/doc/common/builder.py.orig 2014-01-28 15:58:17.552180497 -0200
+++ sage-5.13/spkg/build/sage-5.13/doc/common/builder.py 2014-01-28 15:58:19.905180587 -0200
diff -up src/doc/common/builder.py.orig src/doc/common/builder.py
--- src/doc/common/builder.py.orig 2014-02-07 11:35:55.574699345 -0200
+++ src/doc/common/builder.py 2014-02-07 11:35:58.192699445 -0200
@@ -32,7 +32,7 @@ from sage.env import SAGE_DOC, SAGE_SRC
# SAGE_DOC, LANGUAGES, SPHINXOPTS, PAPER, OMIT,
# PAPEROPTS, ALLSPHINXOPTS, NUM_THREADS, WEBSITESPHINXOPTS
@ -10,9 +10,9 @@ diff -up sage-5.13/spkg/build/sage-5.13/doc/common/builder.py.orig sage-5.13/spk
##########################################
diff -up sage-5.13/spkg/build/sage-5.13/doc/common/conf.py.orig sage-5.13/spkg/build/sage-5.13/doc/common/conf.py
--- sage-5.13/spkg/build/sage-5.13/doc/common/conf.py.orig 2014-01-28 15:58:17.562180497 -0200
+++ sage-5.13/spkg/build/sage-5.13/doc/common/conf.py 2014-01-28 15:58:19.908180587 -0200
diff -up src/doc/common/conf.py.orig src/doc/common/conf.py
--- src/doc/common/conf.py.orig 2014-02-07 11:35:55.584699345 -0200
+++ src/doc/common/conf.py 2014-02-07 11:35:58.194699445 -0200
@@ -1,5 +1,5 @@
import sys, os, sphinx
-from sage.env import SAGE_DOC
@ -30,9 +30,9 @@ diff -up sage-5.13/spkg/build/sage-5.13/doc/common/conf.py.orig sage-5.13/spkg/b
mathjax_relative = os.path.join('sagenb','data','mathjax')
# It would be really nice if sphinx would copy the entire mathjax directory,
diff -up sage-5.13/spkg/build/sage-5.13/sage/doctest/control.py.orig sage-5.13/spkg/build/sage-5.13/sage/doctest/control.py
--- sage-5.13/spkg/build/sage-5.13/sage/doctest/control.py.orig 2014-01-28 15:57:50.711179469 -0200
+++ sage-5.13/spkg/build/sage-5.13/sage/doctest/control.py 2014-01-28 15:58:19.909180587 -0200
diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
--- src/sage/doctest/control.py.orig 2014-02-07 11:35:29.138698333 -0200
+++ src/sage/doctest/control.py 2014-02-07 11:35:58.196699445 -0200
@@ -89,7 +89,6 @@ class DocTestDefaults(SageObject):
self.valgrind = False
self.massif = False
@ -50,7 +50,7 @@ diff -up sage-5.13/spkg/build/sage-5.13/sage/doctest/control.py.orig sage-5.13/s
# Non-interactive debuggers: 48 hours
options.timeout = int(os.getenv('SAGE_TIMEOUT_VALGRIND', 48 * 60 * 60))
elif options.long:
@@ -822,13 +821,8 @@ class DocTestController(SageObject):
@@ -821,13 +820,8 @@ class DocTestController(SageObject):
elif opt.cachegrind:
toolname = "cachegrind"
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
@ -64,7 +64,7 @@ diff -up sage-5.13/spkg/build/sage-5.13/sage/doctest/control.py.orig sage-5.13/s
if "%s" in flags:
flags %= toolname + ".%p" # replace %s with toolname
cmd += flags + sage_cmd
@@ -888,10 +882,10 @@ class DocTestController(SageObject):
@@ -887,10 +881,10 @@ class DocTestController(SageObject):
0
"""
opt = self.options
@ -77,9 +77,9 @@ diff -up sage-5.13/spkg/build/sage-5.13/sage/doctest/control.py.orig sage-5.13/s
return 2
return self.run_val_gdb()
else:
diff -up sage-5.13/spkg/build/sage-5.13/sage/interfaces/singular.py.orig sage-5.13/spkg/build/sage-5.13/sage/interfaces/singular.py
--- sage-5.13/spkg/build/sage-5.13/sage/interfaces/singular.py.orig 2014-01-28 15:58:17.580180498 -0200
+++ sage-5.13/spkg/build/sage-5.13/sage/interfaces/singular.py 2014-01-28 15:58:19.911180587 -0200
diff -up src/sage/interfaces/singular.py.orig src/sage/interfaces/singular.py
--- src/sage/interfaces/singular.py.orig 2014-02-07 11:35:55.605699346 -0200
+++ src/sage/interfaces/singular.py 2014-02-07 11:35:58.198699446 -0200
@@ -2149,7 +2149,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
@ -89,9 +89,9 @@ diff -up sage-5.13/spkg/build/sage-5.13/sage/interfaces/singular.py.orig sage-5.
new_node = re.compile("File: singular\.hlp, Node: ([^,]*),.*")
new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
diff -up sage-5.13/spkg/build/sage-5.13/sage/misc/latex_macros.py.orig sage-5.13/spkg/build/sage-5.13/sage/misc/latex_macros.py
--- sage-5.13/spkg/build/sage-5.13/sage/misc/latex_macros.py.orig 2014-01-28 15:58:17.585180498 -0200
+++ sage-5.13/spkg/build/sage-5.13/sage/misc/latex_macros.py 2014-01-28 15:58:19.912180587 -0200
diff -up src/sage/misc/latex_macros.py.orig src/sage/misc/latex_macros.py
--- src/sage/misc/latex_macros.py.orig 2014-02-07 11:35:55.614699347 -0200
+++ src/sage/misc/latex_macros.py 2014-02-07 11:35:58.199699446 -0200
@@ -142,7 +142,7 @@ def convert_latex_macro_to_mathjax(macro
return name + ': ["' + defn + '",' + str(num_args) + ']'