mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 8.2.
Also: - Create the sagemath-data-combinatorial_designs subpackage. - Create the sagemath-notebook-export subpackage. - Unbundle the LaTeX makecmds style. - Install LaTeX style files in a more canonical place.
This commit is contained in:
parent
b46cd4759a
commit
925e91dade
28 changed files with 743 additions and 795 deletions
|
@ -1,19 +1,7 @@
|
|||
diff -up src/doc/common/conf.py.orig src/doc/common/conf.py
|
||||
--- src/doc/common/conf.py.orig 2017-11-08 08:08:07.554172292 -0500
|
||||
+++ src/doc/common/conf.py 2017-11-08 08:08:33.656173291 -0500
|
||||
@@ -220,7 +220,7 @@ if (os.environ.get('SAGE_DOC_MATHJAX', '
|
||||
html_theme_options['mathjax_macros'] = sage_mathjax_macros()
|
||||
|
||||
from pkg_resources import Requirement, working_set
|
||||
- sagenb_path = working_set.find(Requirement.parse('sagenb')).location
|
||||
+ sagenb_path = SAGE_SRC
|
||||
mathjax_relative = os.path.join('sagenb','data','mathjax')
|
||||
|
||||
# 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 2017-11-08 08:08:44.186173695 -0500
|
||||
+++ src/sage/doctest/control.py 2017-11-08 08:09:24.904175254 -0500
|
||||
@@ -96,7 +96,6 @@ class DocTestDefaults(SageObject):
|
||||
--- 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
|
||||
@@ -102,7 +102,6 @@ class DocTestDefaults(SageObject):
|
||||
self.valgrind = False
|
||||
self.massif = False
|
||||
self.cachegrind = False
|
||||
|
@ -21,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
|
||||
@@ -285,7 +284,7 @@ class DocTestController(SageObject):
|
||||
@@ -292,7 +291,7 @@ class DocTestController(SageObject):
|
||||
if options.gdb or options.debug:
|
||||
# Interactive debuggers: "infinite" timeout
|
||||
options.timeout = 0
|
||||
|
@ -30,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:
|
||||
@@ -1049,13 +1048,8 @@ class DocTestController(SageObject):
|
||||
@@ -1071,13 +1070,8 @@ class DocTestController(SageObject):
|
||||
elif opt.cachegrind:
|
||||
toolname = "cachegrind"
|
||||
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
|
||||
|
@ -44,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
|
||||
@@ -1115,10 +1109,10 @@ class DocTestController(SageObject):
|
||||
@@ -1137,10 +1131,10 @@ class DocTestController(SageObject):
|
||||
0
|
||||
"""
|
||||
opt = self.options
|
||||
|
@ -58,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 2017-11-08 08:09:36.306175691 -0500
|
||||
+++ src/sage/interfaces/singular.py 2017-11-08 08:09:57.144176489 -0500
|
||||
@@ -2287,7 +2287,7 @@ def generate_docstring_dictionary():
|
||||
--- 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():
|
||||
nodes.clear()
|
||||
node_names.clear()
|
||||
|
||||
|
@ -70,8 +58,8 @@ 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 2017-11-08 08:10:07.010176866 -0500
|
||||
+++ src/sage_setup/docbuild/ext/multidocs.py 2017-11-08 08:10:30.319177759 -0500
|
||||
--- 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):
|
||||
for ind in newalldoc:
|
||||
# treat subdocument source as orphaned file and don't complain
|
||||
|
@ -85,11 +73,11 @@ diff -up src/sage_setup/docbuild/ext/multidocs.py.orig src/sage_setup/docbuild/e
|
|||
+ env.metadata[ind] = {'orphan'}
|
||||
# merge the citations
|
||||
newcite = {}
|
||||
for ind, (path, tag) in six.iteritems(docenv.domaindata["std"]["citations"]):
|
||||
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 2017-11-08 08:10:41.962178205 -0500
|
||||
+++ src/sage_setup/docbuild/__init__.py 2017-11-08 08:11:16.448179525 -0500
|
||||
@@ -248,13 +248,14 @@ if NUM_THREADS > 1:
|
||||
--- 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:
|
||||
# map_async handles KeyboardInterrupt correctly. Plain map and
|
||||
# apply_async does not, so don't use it.
|
||||
x = pool.map_async(target, args, 1)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue