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.6

Browse source
This commit is contained in:
pcpa 2017-04-18 16:03:03 -04:00
parent 7e3068b9f2
commit f642d2e41d
16 changed files with 177 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

30
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 2017-03-30 11:27:42.351311111 -0400
+++ src/doc/common/conf.py 2017-03-30 11:27:44.482311193 -0400
@@ -218,7 +218,7 @@ if (os.environ.get('SAGE_DOC_MATHJAX', '
--- src/doc/common/conf.py.orig 2017-04-11 09:55:23.607260518 -0400
+++ src/doc/common/conf.py 2017-04-11 09:55:52.327261618 -0400
@@ -220,7 +220,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 2017-03-30 11:27:42.358311112 -0400
+++ src/sage/doctest/control.py 2017-03-30 11:27:44.483311193 -0400
--- src/sage/doctest/control.py.orig 2017-04-11 09:55:23.610260518 -0400
+++ src/sage/doctest/control.py 2017-04-11 09:55:52.330261618 -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:
@@ -1030,13 +1029,8 @@ class DocTestController(SageObject):
@@ -1034,13 +1033,8 @@ class DocTestController(SageObject):
elif opt.cachegrind:
toolname = "cachegrind"
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
@ -44,7 +44,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
@@ -1096,10 +1090,10 @@ class DocTestController(SageObject):
@@ -1100,10 +1094,10 @@ class DocTestController(SageObject):
0
"""
opt = self.options
@ -58,8 +58,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 2017-03-30 11:27:42.364311112 -0400
+++ src/sage/interfaces/singular.py 2017-03-30 11:27:44.486311193 -0400
--- src/sage/interfaces/singular.py.orig 2017-04-11 09:55:50.260261539 -0400
+++ src/sage/interfaces/singular.py 2017-04-11 09:55:52.332261618 -0400
@@ -2291,7 +2291,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
@ -70,9 +70,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 2017-03-30 11:27:42.371311112 -0400
+++ src/sage_setup/docbuild/ext/multidocs.py 2017-03-30 11:27:44.487311193 -0400
@@ -83,8 +83,11 @@ def merge_environment(app, env):
--- src/sage_setup/docbuild/ext/multidocs.py.orig 2017-04-11 09:55:23.612260518 -0400
+++ src/sage_setup/docbuild/ext/multidocs.py 2017-04-11 09:55:52.332261618 -0400
@@ -84,8 +84,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())
@ -85,10 +85,10 @@ diff -up src/sage_setup/docbuild/ext/multidocs.py.orig src/sage_setup/docbuild/e
+ env.metadata[ind] = {'orphan'}
# merge the citations
newcite = {}
for ind, (path, tag) in docenv.citations.iteritems():
for ind, (path, tag) in six.iteritems(docenv.citations):
diff -up src/sage_setup/docbuild/__init__.py.orig src/sage_setup/docbuild/__init__.py
--- src/sage_setup/docbuild/__init__.py.orig 2017-03-30 11:27:42.379311112 -0400
+++ src/sage_setup/docbuild/__init__.py 2017-03-30 11:29:25.179315049 -0400
--- src/sage_setup/docbuild/__init__.py.orig 2017-04-11 09:55:50.272261539 -0400
+++ src/sage_setup/docbuild/__init__.py 2017-04-11 09:55:52.333261618 -0400
@@ -248,13 +248,14 @@ if NUM_THREADS > 1:
# map_async handles KeyboardInterrupt correctly. Plain map and
# apply_async does not, so don't use it.