mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 8.7.
- Drop upstreamed -giac patch. - Add -sagetex patch to fix a python indentation error. - Add -rubiks patch to fix compilation of the rubiks library. - Add -random patch to fix a non-random random bit generator. - Drop pip3 workaround; the binary is now named just pip again.
This commit is contained in:
Jerry James
parent
b6408b9313
commit
05337076b6
21 changed files with 898 additions and 442 deletions
|
|
@ -1,6 +1,6 @@
|
|||
diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
|
||||
--- src/sage/doctest/control.py.orig 2018-12-22 16:37:08.000000000 -0700
|
||||
+++ src/sage/doctest/control.py 2019-01-16 09:42:51.238828275 -0700
|
||||
--- src/sage/doctest/control.py.orig 2019-03-23 16:20:40.000000000 -0600
|
||||
+++ src/sage/doctest/control.py 2019-04-08 11:49:50.428160023 -0600
|
||||
@@ -106,7 +106,6 @@ class DocTestDefaults(SageObject):
|
||||
self.valgrind = False
|
||||
self.massif = False
|
||||
|
|
@ -18,7 +18,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:
|
||||
@@ -1099,13 +1098,8 @@ class DocTestController(SageObject):
|
||||
@@ -1105,13 +1104,8 @@ class DocTestController(SageObject):
|
||||
elif opt.cachegrind:
|
||||
toolname = "cachegrind"
|
||||
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
|
||||
|
|
@ -32,7 +32,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
|
||||
@@ -1190,10 +1184,10 @@ class DocTestController(SageObject):
|
||||
@@ -1196,10 +1190,10 @@ class DocTestController(SageObject):
|
||||
|
||||
"""
|
||||
opt = self.options
|
||||
|
|
@ -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 2018-12-22 16:37:08.000000000 -0700
|
||||
+++ src/sage/interfaces/singular.py 2019-01-16 09:42:51.240828239 -0700
|
||||
@@ -2264,7 +2264,7 @@ def generate_docstring_dictionary():
|
||||
--- src/sage/interfaces/singular.py.orig 2019-03-23 16:20:41.000000000 -0600
|
||||
+++ src/sage/interfaces/singular.py 2019-04-08 11:54:23.579318505 -0600
|
||||
@@ -2261,7 +2261,7 @@ def generate_docstring_dictionary():
|
||||
nodes.clear()
|
||||
node_names.clear()
|
||||
|
||||
import os
|
||||
- singular_docdir = os.environ['SINGULARPATH']+"/../info/"
|
||||
+ singular_docdir = "/usr/share/info/"
|
||||
|
||||
new_node = re.compile(r"File: singular\.hlp, Node: ([^,]*),.*")
|
||||
new_lookup = re.compile(r"\* ([^:]*):*([^.]*)\..*")
|
||||
@@ -2272,8 +2272,9 @@ def generate_docstring_dictionary():
|
||||
@@ -2269,8 +2269,9 @@ def generate_docstring_dictionary():
|
||||
L, in_node, curr_node = [], False, None
|
||||
|
||||
# singular.hlp contains a few iso-5559-1 encoded special characters
|
||||
|
|
@ -65,13 +65,13 @@ diff -up src/sage/interfaces/singular.py.orig src/sage/interfaces/singular.py
|
|||
- encoding='latin-1') as f:
|
||||
+ import gzip
|
||||
+ with gzip.open(os.path.join(singular_doctir, 'singular.hlp.gz'),
|
||||
+ encoding='latin-1') as f:
|
||||
+ encoding='utf-8') as f:
|
||||
for line in f:
|
||||
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 2018-12-22 16:37:10.000000000 -0700
|
||||
+++ src/sage_setup/docbuild/ext/multidocs.py 2019-01-16 09:42:51.241828221 -0700
|
||||
--- src/sage_setup/docbuild/ext/multidocs.py.orig 2019-03-23 16:20:43.000000000 -0600
|
||||
+++ src/sage_setup/docbuild/ext/multidocs.py 2019-04-08 11:49:50.430159987 -0600
|
||||
@@ -84,8 +84,11 @@ def merge_environment(app, env):
|
||||
for ind in newalldoc:
|
||||
# treat subdocument source as orphaned file and don't complain
|
||||
|
|
@ -87,22 +87,22 @@ diff -up src/sage_setup/docbuild/ext/multidocs.py.orig src/sage_setup/docbuild/e
|
|||
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 2018-12-22 16:37:10.000000000 -0700
|
||||
+++ src/sage_setup/docbuild/__init__.py 2019-01-16 09:42:51.242828203 -0700
|
||||
@@ -279,13 +279,14 @@ def build_many(target, args):
|
||||
# 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
|
||||
|
||||
--- src/sage_setup/docbuild/__init__.py.orig 2019-04-08 11:49:50.431159970 -0600
|
||||
+++ src/sage_setup/docbuild/__init__.py 2019-04-08 11:56:02.609563240 -0600
|
||||
@@ -287,13 +287,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:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue