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

Browse source
This commit is contained in:
pcpa 2017-04-06 08:02:52 -04:00
parent ac3aa7f6b7
commit 056e08d023
24 changed files with 481 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

67
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-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', '
--- 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', '
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-10-20 08:03:49.619528319 -0400
+++ src/sage/doctest/control.py 2016-10-20 08:04:20.283529494 -0400
--- 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
@@ -95,7 +95,6 @@ class DocTestDefaults(SageObject):
self.valgrind = False
self.massif = False
@ -30,15 +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:
@@ -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'))
- self.files.append(opj(SAGE_SRC, 'sage_setup'))
self.files.append(SAGE_DOC_SRC)
self.options.sagenb = True
DOT_GIT= opj(SAGE_ROOT, '.git')
@@ -1030,13 +1028,8 @@ class DocTestController(SageObject):
@@ -1030,13 +1029,8 @@ class DocTestController(SageObject):
elif opt.cachegrind:
toolname = "cachegrind"
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
@ -52,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 +1089,10 @@ class DocTestController(SageObject):
@@ -1096,10 +1090,10 @@ class DocTestController(SageObject):
0
"""
opt = self.options
@ -66,20 +58,20 @@ 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-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():
--- 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
@@ -2291,7 +2291,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
- singular_docdir = os.environ["SAGE_LOCAL"]+"/share/singular/"
- singular_docdir = SAGE_LOCAL+"/share/info/"
+ singular_docdir = os.environ["SINGULAR_BIN_DIR"]+"/info/"
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-10-20 08:03:49.622528319 -0400
+++ src/sage_setup/docbuild/ext/multidocs.py 2016-10-20 08:04:20.287529494 -0400
--- 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):
for ind in newalldoc:
# treat subdocument source as orphaned file and don't complain
@ -95,14 +87,16 @@ 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-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):
--- 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
@@ -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.
x = pool.map_async(build_other_doc, L, 1)
x = pool.map_async(target, args, 1)
+ ret = []
try:
- x.get(99999)
+ x.get(3600)
- ret = x.get(99999)
+ ret = x.get(3600)
pool.close()
pool.join()
except Exception:
@ -110,20 +104,5 @@ diff -up src/sage_setup/docbuild/__init__.py.orig src/sage_setup/docbuild/__init
if ABORT_ON_ERROR:
+ pool.terminate()
raise
logger.warning("Elapsed time: %.1f seconds."%(time.time()-start))
logger.warning("Done building the documentation!")
@@ -492,12 +492,12 @@ class ReferenceBuilder(AllBuilder):
# (See comment in AllBuilder._wrapper about using map instead of apply.)
x = pool.map_async(build_ref_doc, L, 1)
try:
- x.get(99999)
+ x.get(3600)
pool.close()
pool.join()
except Exception:
- pool.terminate()
if ABORT_ON_ERROR:
+ pool.terminate()
raise
# The html refman must be build at the end to ensure correct
# merging of indexes and inventories.
return ret
else: