zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to sagemath 6.3

Browse source
This commit is contained in:
pcpa 2014-08-15 13:30:04 -03:00
parent 86aa0a3b29
commit 886f9fabef
22 changed files with 1019 additions and 1023 deletions
Download patch file Download diff file Expand all files Collapse all files

37
sagemath-sagedoc.patch
View file

@ -1,5 +1,6 @@
--- src/doc/common/builder.py.orig 2014-05-10 15:44:39.046203443 -0300
+++ src/doc/common/builder.py 2014-05-10 15:45:03.225201708 -0300
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
@@ -32,7 +32,7 @@ from sage.env import SAGE_DOC, SAGE_SRC
# SAGE_DOC, LANGUAGES, SPHINXOPTS, PAPER, OMIT,
# PAPEROPTS, ALLSPHINXOPTS, NUM_THREADS, WEBSITESPHINXOPTS
@ -8,17 +9,18 @@
+execfile(os.path.join(os.getenv('SAGE_ROOT'), 'src', 'doc', 'common' , 'build_options.py'))
def print_build_error():
--- src/doc/common/conf.py.orig 2014-05-10 15:44:59.936201944 -0300
+++ src/doc/common/conf.py 2014-05-10 15:45:03.229201708 -0300
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
@@ -1,5 +1,5 @@
import sys, os, sphinx
-from sage.env import SAGE_DOC
+from sage.env import SAGE_DOC, SAGE_SRC
from datetime import date
def get_doc_abspath(path):
"""
@@ -202,8 +202,7 @@ if (os.environ.get('SAGE_DOC_MATHJAX', '
@@ -203,8 +203,7 @@ if (os.environ.get('SAGE_DOC_MATHJAX', '
from sage.misc.latex_macros import sage_mathjax_macros
html_theme_options['mathjax_macros'] = sage_mathjax_macros()
@ -28,8 +30,9 @@
mathjax_relative = os.path.join('sagenb','data','mathjax')
# It would be really nice if sphinx would copy the entire mathjax directory,
--- src/sage/doctest/control.py.orig 2014-05-10 15:44:59.940201944 -0300
+++ src/sage/doctest/control.py 2014-05-10 15:45:03.230201708 -0300
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
@@ -89,7 +89,6 @@ class DocTestDefaults(SageObject):
self.valgrind = False
self.massif = False
@ -47,7 +50,7 @@
# Non-interactive debuggers: 48 hours
options.timeout = int(os.getenv('SAGE_TIMEOUT_VALGRIND', 48 * 60 * 60))
elif options.long:
@@ -821,13 +820,8 @@ class DocTestController(SageObject):
@@ -822,13 +821,8 @@ class DocTestController(SageObject):
elif opt.cachegrind:
toolname = "cachegrind"
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
@ -61,7 +64,7 @@
if "%s" in flags:
flags %= toolname + ".%p" # replace %s with toolname
cmd += flags + sage_cmd
@@ -887,10 +881,10 @@ class DocTestController(SageObject):
@@ -888,10 +882,10 @@ class DocTestController(SageObject):
0
"""
opt = self.options
@ -74,9 +77,10 @@
return 2
return self.run_val_gdb()
else:
--- src/sage/interfaces/singular.py.orig 2014-05-10 15:44:59.940201944 -0300
+++ src/sage/interfaces/singular.py 2014-05-10 15:45:03.230201708 -0300
@@ -2149,7 +2149,7 @@ def generate_docstring_dictionary():
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
@@ -2147,7 +2147,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
@ -85,8 +89,9 @@
new_node = re.compile("File: singular\.hlp, Node: ([^,]*),.*")
new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
--- src/sage/misc/latex_macros.py.orig 2014-05-10 15:44:59.940201944 -0300
+++ src/sage/misc/latex_macros.py 2014-05-10 15:45:03.232201708 -0300
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) + ']'