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

Version 9.2 (bz 1891244)

Browse source 
- Unbundle widgetsnbextension (bz 1856311)
- Unbundle mathjax fonts (bz 1875606)
- Do not require the -doc subpackage from the main package (bz 1867123)
- Drop upstreamed patches: -ecl, -fes, -includes, -sagetex, -sigfpe, -sympy
This commit is contained in:
Jerry James 2020-11-11 16:28:59 -07:00
parent de0ac7db5f
commit 861d3bcc88
34 changed files with 1210 additions and 4460 deletions
Download patch file Download diff file Expand all files Collapse all files

28
sagemath-sagedoc.patch
View file

@ -1,7 +1,7 @@
diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
--- 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):
--- src/sage/doctest/control.py.orig 2020-10-24 11:37:59.000000000 -0600
+++ src/sage/doctest/control.py 2020-10-30 13:55:37.330649309 -0600
@@ -115,7 +115,6 @@ class DocTestDefaults(SageObject):
self.valgrind = False
self.massif = False
self.cachegrind = False
@ -9,7 +9,7 @@ diff -up src/sage/doctest/control.py.orig src/sage/doctest/control.py
self.failed = False
self.new = False
self.show_skipped = False
@@ -309,7 +308,7 @@ class DocTestController(SageObject):
@@ -318,7 +317,7 @@ class DocTestController(SageObject):
if options.gdb or options.debug:
# Interactive debuggers: "infinite" timeout
options.timeout = 0
@ -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:
@@ -1105,13 +1104,8 @@ class DocTestController(SageObject):
@@ -1109,13 +1108,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
@@ -1196,10 +1190,10 @@ class DocTestController(SageObject):
@@ -1201,10 +1195,10 @@ class DocTestController(SageObject):
"""
opt = self.options
@ -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 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():
--- src/sage/interfaces/singular.py.orig 2020-10-24 11:37:59.000000000 -0600
+++ src/sage/interfaces/singular.py 2020-10-30 13:55:37.332649306 -0600
@@ -2349,7 +2349,7 @@ def generate_docstring_dictionary():
nodes.clear()
node_names.clear()
@ -57,7 +57,7 @@ diff -up src/sage/interfaces/singular.py.orig src/sage/interfaces/singular.py
new_node = re.compile(r"File: singular\.hlp, Node: ([^,]*),.*")
new_lookup = re.compile(r"\* ([^:]*):*([^.]*)\..*")
@@ -2270,8 +2270,9 @@ def generate_docstring_dictionary():
@@ -2357,8 +2357,9 @@ def generate_docstring_dictionary():
L, in_node, curr_node = [], False, None
# singular.hlp contains a few iso-5559-1 encoded special characters
@ -70,9 +70,9 @@ 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-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):
--- src/sage_setup/docbuild/ext/multidocs.py.orig 2020-10-24 11:37:59.000000000 -0600
+++ src/sage_setup/docbuild/ext/multidocs.py 2020-10-30 13:55:37.332649306 -0600
@@ -82,8 +82,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,4 +85,4 @@ diff -up src/sage_setup/docbuild/ext/multidocs.py.orig src/sage_setup/docbuild/e
+ env.metadata[ind] = {'orphan'}
# merge the citations
newcite = {}
citations = docenv.domaindata["std"]["citations"]
for ind, (path, tag, lineno) in citations.items():