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 7.4

Browse source
This commit is contained in:
pcpa 2016-12-30 10:04:34 -05:00
parent 6b381937c4
commit 807c53b3b6
21 changed files with 299 additions and 2458 deletions
Download patch file Download diff file Expand all files Collapse all files

32
sagemath-sagedoc.patch
View file

@ -1,7 +1,7 @@
diff -up src/doc/common/conf.py.orig src/doc/common/conf.py
--- src/doc/common/conf.py.orig 2016-08-08 13:21:49.624502727 -0400
+++ src/doc/common/conf.py 2016-08-08 13:22:19.945503888 -0400
@@ -218,7 +218,7 @@ if (os.environ.get('SAGE_DOC_MATHJAX', '
--- src/doc/common/conf.py.orig 2016-10-20 08:03:49.618528319 -0400
+++ src/doc/common/conf.py 2016-10-20 08:04:20.281529493 -0400
@@ -217,7 +217,7 @@ if (os.environ.get('SAGE_DOC_MATHJAX', '
html_theme_options['mathjax_macros'] = sage_mathjax_macros()
from pkg_resources import Requirement, working_set
@ -11,8 +11,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 2016-08-08 13:22:48.247504971 -0400
+++ src/sage/doctest/control.py 2016-08-08 13:23:38.842506909 -0400
--- src/sage/doctest/control.py.orig 2016-10-20 08:03:49.619528319 -0400
+++ src/sage/doctest/control.py 2016-10-20 08:04:20.283529494 -0400
@@ -95,7 +95,6 @@ class DocTestDefaults(SageObject):
self.valgrind = False
self.massif = False
@ -30,7 +30,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:
@@ -636,7 +635,6 @@ class DocTestController(SageObject):
@@ -635,7 +634,6 @@ class DocTestController(SageObject):
from sage.env import SAGE_SRC, SAGE_DOC_SRC, SAGE_ROOT
def all_files():
self.files.append(opj(SAGE_SRC, 'sage'))
@ -38,7 +38,7 @@ diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
self.files.append(SAGE_DOC_SRC)
self.options.sagenb = True
DOT_GIT= opj(SAGE_ROOT, '.git')
@@ -1031,13 +1029,8 @@ class DocTestController(SageObject):
@@ -1030,13 +1028,8 @@ class DocTestController(SageObject):
elif opt.cachegrind:
toolname = "cachegrind"
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
@ -52,7 +52,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
@@ -1097,10 +1090,10 @@ class DocTestController(SageObject):
@@ -1096,10 +1089,10 @@ class DocTestController(SageObject):
0
"""
opt = self.options
@ -66,9 +66,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 2016-08-08 13:23:50.344507349 -0400
+++ src/sage/interfaces/singular.py 2016-08-08 13:24:08.618508049 -0400
@@ -2249,7 +2249,7 @@ def generate_docstring_dictionary():
--- src/sage/interfaces/singular.py.orig 2016-10-20 08:03:49.621528319 -0400
+++ src/sage/interfaces/singular.py 2016-10-20 08:04:20.286529494 -0400
@@ -2258,7 +2258,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
@ -78,9 +78,9 @@ 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_setup/docbuild/ext/multidocs.py.orig src/sage_setup/docbuild/ext/multidocs.py
--- src/sage_setup/docbuild/ext/multidocs.py.orig 2016-08-10 14:37:02.566492810 -0400
+++ src/sage_setup/docbuild/ext/multidocs.py 2016-08-10 14:37:31.238493908 -0400
@@ -78,8 +78,11 @@ def merge_environment(app, env):
--- src/sage_setup/docbuild/ext/multidocs.py.orig 2016-10-20 08:03:49.622528319 -0400
+++ src/sage_setup/docbuild/ext/multidocs.py 2016-10-20 08:04:20.287529494 -0400
@@ -83,8 +83,11 @@ def merge_environment(app, env):
for ind in newalldoc:
# treat subdocument source as orphaned file and don't complain
md = env.metadata.get(ind, dict())
@ -95,8 +95,8 @@ diff -up src/sage_setup/docbuild/ext/multidocs.py.orig src/sage_setup/docbuild/e
newcite = {}
for ind, (path, tag) in docenv.citations.iteritems():
diff -up src/sage_setup/docbuild/__init__.py.orig src/sage_setup/docbuild/__init__.py
--- src/sage_setup/docbuild/__init__.py.orig 2016-08-10 14:33:38.854485009 -0400
+++ src/sage_setup/docbuild/__init__.py 2016-08-10 14:34:22.591486684 -0400
--- src/sage_setup/docbuild/__init__.py.orig 2016-10-20 08:04:16.858529362 -0400
+++ src/sage_setup/docbuild/__init__.py 2016-10-20 08:04:20.288529494 -0400
@@ -295,12 +295,12 @@ class AllBuilder(object):
# apply_async does not, so don't use it.
x = pool.map_async(build_other_doc, L, 1)