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 latest upstream release

Browse source
This commit is contained in:
pcpa 2019-11-08 08:46:01 -03:00
parent fa050d6863
commit 7b54d2115b
20 changed files with 285 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

38
sagemath-sagedoc.patch
View file

@ -1,6 +1,6 @@
diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
--- src/sage/doctest/control.py.orig 2019-06-26 14:41:04.000000000 -0600
+++ src/sage/doctest/control.py 2019-06-27 11:30:37.222951288 -0600
--- src/sage/doctest/control.py.orig 2019-10-03 14:51:45.323319025 -0300
+++ src/sage/doctest/control.py 2019-10-03 14:52:24.063545626 -0300
@@ -106,7 +106,6 @@ class DocTestDefaults(SageObject):
self.valgrind = False
self.massif = False
@ -46,18 +46,18 @@ 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 2019-06-26 14:41:05.000000000 -0600
+++ src/sage/interfaces/singular.py 2019-06-27 11:30:37.223951272 -0600
@@ -2261,7 +2261,7 @@ def generate_docstring_dictionary():
--- src/sage/interfaces/singular.py.orig 2019-10-03 14:52:35.554612838 -0300
+++ src/sage/interfaces/singular.py 2019-10-03 14:53:22.502887441 -0300
@@ -2262,7 +2262,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
- singular_docdir = os.environ['SINGULARPATH']+"/../info/"
- singular_docdir = SINGULARPATH + "/../info/"
+ singular_docdir = "/usr/share/info/"
new_node = re.compile(r"File: singular\.hlp, Node: ([^,]*),.*")
new_lookup = re.compile(r"\* ([^:]*):*([^.]*)\..*")
@@ -2269,8 +2269,9 @@ def generate_docstring_dictionary():
@@ -2270,8 +2270,9 @@ def generate_docstring_dictionary():
L, in_node, curr_node = [], False, None
# singular.hlp contains a few iso-5559-1 encoded special characters
@ -70,8 +70,8 @@ diff -up src/sage/interfaces/singular.py.orig src/sage/interfaces/singular.py
m = re.match(new_node,line)
if m:
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 2019-06-26 14:41:05.000000000 -0600
+++ src/sage_setup/docbuild/ext/multidocs.py 2019-06-27 11:30:37.224951257 -0600
--- src/sage_setup/docbuild/ext/multidocs.py.orig 2019-10-03 14:53:32.585946418 -0300
+++ src/sage_setup/docbuild/ext/multidocs.py 2019-10-03 14:54:02.207119676 -0300
@@ -85,8 +85,11 @@ def merge_environment(app, env):
for ind in newalldoc:
# treat subdocument source as orphaned file and don't complain
@ -86,23 +86,3 @@ diff -up src/sage_setup/docbuild/ext/multidocs.py.orig src/sage_setup/docbuild/e
# merge the citations
newcite = {}
citations = docenv.domaindata["std"]["citations"]
diff -up src/sage_setup/docbuild/__init__.py.orig src/sage_setup/docbuild/__init__.py
--- src/sage_setup/docbuild/__init__.py.orig 2019-06-26 14:41:05.000000000 -0600
+++ src/sage_setup/docbuild/__init__.py 2019-06-27 11:30:37.225951242 -0600
@@ -284,13 +284,14 @@ if not (CYGWIN_VERSION and CYGWIN_VERSIO
# map_async handles KeyboardInterrupt correctly. Plain map and
# apply_async does not, so don't use it.
x = pool.map_async(target, args, 1)
+ ret = []
try:
- ret = x.get(99999)
+ ret = x.get(3600)
pool.close()
pool.join()
except Exception:
- pool.terminate()
if ABORT_ON_ERROR:
+ pool.terminate()
raise
return ret
else: