Update to sagemath 6.5

This commit is contained in:
pcpa 2015-04-03 20:10:52 -03:00
parent 48c70ab672
commit baae9bd2a8
23 changed files with 299 additions and 174 deletions

View file

@ -1,6 +1,6 @@
diff -up src/doc/common/builder.py.orig src/doc/common/builder.py
--- src/doc/common/builder.py.orig 2014-11-18 13:30:43.238037217 -0200
+++ src/doc/common/builder.py 2014-11-18 13:32:05.097038298 -0200
--- src/doc/common/builder.py.orig 2015-04-03 14:56:53.775377558 -0300
+++ src/doc/common/builder.py 2015-04-03 14:56:58.208377728 -0300
@@ -32,7 +32,7 @@ from sage.env import SAGE_DOC, SAGE_SRC
# SAGE_DOC, LANGUAGES, SPHINXOPTS, PAPER, OMIT,
# PAPEROPTS, ALLSPHINXOPTS, NUM_THREADS, WEBSITESPHINXOPTS
@ -11,8 +11,8 @@ diff -up src/doc/common/builder.py.orig src/doc/common/builder.py
diff -up src/doc/common/conf.py.orig src/doc/common/conf.py
--- src/doc/common/conf.py.orig 2014-11-18 13:30:43.248037218 -0200
+++ src/doc/common/conf.py 2014-11-18 13:32:40.336038763 -0200
--- src/doc/common/conf.py.orig 2015-04-03 14:56:53.777377558 -0300
+++ src/doc/common/conf.py 2015-04-03 14:56:58.208377728 -0300
@@ -1,5 +1,5 @@
import sys, os, sphinx
-from sage.env import SAGE_DOC
@ -31,8 +31,8 @@ diff -up src/doc/common/conf.py.orig src/doc/common/conf.py
# It would be really nice if sphinx would copy the entire mathjax directory,
diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
--- src/sage/doctest/control.py.orig 2014-11-18 13:30:43.259037218 -0200
+++ src/sage/doctest/control.py 2014-11-18 13:33:27.185039382 -0200
--- src/sage/doctest/control.py.orig 2015-04-03 14:56:32.065376727 -0300
+++ src/sage/doctest/control.py 2015-04-03 14:56:58.209377728 -0300
@@ -89,7 +89,6 @@ class DocTestDefaults(SageObject):
self.valgrind = False
self.massif = False
@ -50,7 +50,7 @@ diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
# Non-interactive debuggers: 48 hours
options.timeout = int(os.getenv('SAGE_TIMEOUT_VALGRIND', 48 * 60 * 60))
elif options.long:
@@ -889,13 +888,8 @@ class DocTestController(SageObject):
@@ -890,13 +889,8 @@ class DocTestController(SageObject):
elif opt.cachegrind:
toolname = "cachegrind"
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
@ -64,7 +64,7 @@ diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
if "%s" in flags:
flags %= toolname + ".%p" # replace %s with toolname
cmd += flags + sage_cmd
@@ -955,10 +949,10 @@ class DocTestController(SageObject):
@@ -956,10 +950,10 @@ class DocTestController(SageObject):
0
"""
opt = self.options
@ -78,9 +78,9 @@ diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
return self.run_val_gdb()
else:
diff -up src/sage/interfaces/singular.py.orig src/sage/interfaces/singular.py
--- src/sage/interfaces/singular.py.orig 2014-11-18 13:30:43.265037218 -0200
+++ src/sage/interfaces/singular.py 2014-11-18 13:33:49.257039673 -0200
@@ -2147,7 +2147,7 @@ def generate_docstring_dictionary():
--- src/sage/interfaces/singular.py.orig 2015-04-03 14:56:32.066376727 -0300
+++ src/sage/interfaces/singular.py 2015-04-03 14:56:58.210377728 -0300
@@ -2149,7 +2149,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()