Update to sagemath 6.4.1

This commit is contained in:
pcpa 2014-12-13 21:05:42 -02:00
parent 3e866bf86e
commit 738094a8d8
27 changed files with 276 additions and 12243 deletions

View file

@ -1,18 +1,18 @@
diff -up src/doc/common/builder.py.orig src/doc/common/builder.py
--- src/doc/common/builder.py.orig 2014-08-12 14:06:23.374946290 -0300
+++ src/doc/common/builder.py 2014-08-12 14:06:47.943947231 -0300
--- 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
@@ -32,7 +32,7 @@ from sage.env import SAGE_DOC, SAGE_SRC
# SAGE_DOC, LANGUAGES, SPHINXOPTS, PAPER, OMIT,
# PAPEROPTS, ALLSPHINXOPTS, NUM_THREADS, WEBSITESPHINXOPTS
# from build_options.py.
-execfile(os.path.join(SAGE_DOC, 'common' , 'build_options.py'))
+execfile(os.path.join(os.getenv('SAGE_ROOT'), 'src', 'doc', 'common' , 'build_options.py'))
-fpath = os.path.join(SAGE_DOC, 'common', 'build_options.py')
+fpath = os.path.join(os.getenv('SAGE_ROOT'), 'src', 'doc', 'common', 'build_options.py')
exec(compile(open(fpath).read(), fpath, 'exec'))
def delete_empty_directories(root_dir, verbose=True):
diff -up src/doc/common/conf.py.orig src/doc/common/conf.py
--- src/doc/common/conf.py.orig 2014-08-12 14:06:23.376946291 -0300
+++ src/doc/common/conf.py 2014-08-12 14:07:26.095948692 -0300
--- 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
@@ -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-08-12 14:06:23.382946291 -0300
+++ src/sage/doctest/control.py 2014-08-12 14:08:08.384950312 -0300
--- 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
@@ -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:
@@ -822,13 +821,8 @@ class DocTestController(SageObject):
@@ -889,13 +888,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
@@ -888,10 +882,10 @@ class DocTestController(SageObject):
@@ -955,10 +949,10 @@ class DocTestController(SageObject):
0
"""
opt = self.options
@ -78,8 +78,8 @@ 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-08-12 14:06:23.391946291 -0300
+++ src/sage/interfaces/singular.py 2014-08-12 14:08:26.055950988 -0300
--- 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():
nodes.clear()
node_names.clear()
@ -89,15 +89,3 @@ diff -up src/sage/interfaces/singular.py.orig src/sage/interfaces/singular.py
new_node = re.compile("File: singular\.hlp, Node: ([^,]*),.*")
new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
diff -up src/sage/misc/latex_macros.py.orig src/sage/misc/latex_macros.py
--- src/sage/misc/latex_macros.py.orig 2014-08-12 14:06:23.402946292 -0300
+++ src/sage/misc/latex_macros.py 2014-08-12 14:08:46.103951756 -0300
@@ -142,7 +142,7 @@ def convert_latex_macro_to_mathjax(macro
return name + ': ["' + defn + '",' + str(num_args) + ']'
from superseded import deprecated_function_alias
-convert_latex_macro_to_jsmath = deprecated_function_alias(13508, convert_latex_macro_to_mathjax)
+convert_latex_macro_to_jsmath = convert_latex_macro_to_mathjax
# To add a new macro for use in the Sage documentation, add a list or
# tuple to the following list. Each list (or tuple) should have the