Update to sagemath 8.3 (bz 1612867).

Also:
- Drop -lrslib, -gap-hap, and -flask patches.
- Drop obsolete scriplets to fix F24 to F25 upgrade (bz 1594429 and 1618934).
- Drop obsolete mktexlsr invocations.
- Fix more Singular paths.
- Fix still more uses of /usr/bin/env.
- Drop disallow/dissallow fixup for cython; now fixed in cython itself.
This commit is contained in:
Jerry James 2018-09-23 08:28:54 -06:00
parent 3dc6dbb3c1
commit 1a0bd1afc6
24 changed files with 285 additions and 525 deletions

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 2018-05-05 16:21:23.000000000 -0600
+++ src/sage/doctest/control.py 2018-05-16 13:20:01.420837824 -0600
--- src/sage/doctest/control.py.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/sage/doctest/control.py 2018-08-29 08:36:07.805487927 -0600
@@ -102,7 +102,6 @@ class DocTestDefaults(SageObject):
self.valgrind = False
self.massif = False
@ -46,9 +46,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 2018-05-05 16:21:24.000000000 -0600
+++ src/sage/interfaces/singular.py 2018-05-16 13:20:01.421837810 -0600
@@ -2258,7 +2258,7 @@ def generate_docstring_dictionary():
--- src/sage/interfaces/singular.py.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/sage/interfaces/singular.py 2018-08-29 08:36:07.818487766 -0600
@@ -2262,7 +2262,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
@ -58,9 +58,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 2018-05-05 16:21:26.000000000 -0600
+++ src/sage_setup/docbuild/ext/multidocs.py 2018-05-16 13:20:01.421837810 -0600
@@ -82,8 +82,11 @@ def merge_environment(app, env):
--- src/sage_setup/docbuild/ext/multidocs.py.orig 2018-08-03 05:10:09.000000000 -0600
+++ src/sage_setup/docbuild/ext/multidocs.py 2018-08-29 08:36:07.829487630 -0600
@@ -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())
@ -75,9 +75,9 @@ 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-05-05 16:21:26.000000000 -0600
+++ src/sage_setup/docbuild/__init__.py 2018-05-16 13:20:01.422837797 -0600
@@ -242,13 +242,14 @@ if NUM_THREADS > 1:
--- src/sage_setup/docbuild/__init__.py.orig 2018-08-03 05:10:09.000000000 -0600
+++ src/sage_setup/docbuild/__init__.py 2018-08-29 08:36:07.837487531 -0600
@@ -272,13 +272,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(target, args, 1)