mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
103 lines
4.9 KiB
Diff
103 lines
4.9 KiB
Diff
diff -up src/doc/common/builder.py.orig src/doc/common/builder.py
|
|
--- src/doc/common/builder.py.orig 2014-08-12 14:06:23.374946290 -0300
|
|
+++ src/doc/common/builder.py 2014-08-12 14:06:47.943947231 -0300
|
|
@@ -32,7 +32,7 @@ from sage.env import SAGE_DOC, SAGE_SRC
|
|
# SAGE_DOC, LANGUAGES, SPHINXOPTS, PAPER, OMIT,
|
|
# PAPEROPTS, ALLSPHINXOPTS, NUM_THREADS, WEBSITESPHINXOPTS
|
|
# from build_options.py.
|
|
-execfile(os.path.join(SAGE_DOC, 'common' , 'build_options.py'))
|
|
+execfile(os.path.join(os.getenv('SAGE_ROOT'), 'src', 'doc', 'common' , 'build_options.py'))
|
|
|
|
|
|
def delete_empty_directories(root_dir, verbose=True):
|
|
diff -up src/doc/common/conf.py.orig src/doc/common/conf.py
|
|
--- src/doc/common/conf.py.orig 2014-08-12 14:06:23.376946291 -0300
|
|
+++ src/doc/common/conf.py 2014-08-12 14:07:26.095948692 -0300
|
|
@@ -1,5 +1,5 @@
|
|
import sys, os, sphinx
|
|
-from sage.env import SAGE_DOC
|
|
+from sage.env import SAGE_DOC, SAGE_SRC
|
|
from datetime import date
|
|
|
|
def get_doc_abspath(path):
|
|
@@ -203,8 +203,7 @@ if (os.environ.get('SAGE_DOC_MATHJAX', '
|
|
from sage.misc.latex_macros import sage_mathjax_macros
|
|
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 2014-08-12 14:06:23.382946291 -0300
|
|
+++ src/sage/doctest/control.py 2014-08-12 14:08:08.384950312 -0300
|
|
@@ -89,7 +89,6 @@ class DocTestDefaults(SageObject):
|
|
self.valgrind = False
|
|
self.massif = False
|
|
self.cachegrind = False
|
|
- self.omega = False
|
|
self.failed = False
|
|
self.new = False
|
|
self.show_skipped = False
|
|
@@ -211,7 +210,7 @@ class DocTestController(SageObject):
|
|
if options.gdb or options.debug:
|
|
# Interactive debuggers: "infinite" timeout
|
|
options.timeout = 0
|
|
- elif options.valgrind or options.massif or options.cachegrind or options.omega:
|
|
+ elif options.valgrind or options.massif or options.cachegrind:
|
|
# Non-interactive debuggers: 48 hours
|
|
options.timeout = int(os.getenv('SAGE_TIMEOUT_VALGRIND', 48 * 60 * 60))
|
|
elif options.long:
|
|
@@ -822,13 +821,8 @@ class DocTestController(SageObject):
|
|
elif opt.cachegrind:
|
|
toolname = "cachegrind"
|
|
flags = os.getenv("SAGE_CACHEGRIND_FLAGS", "")
|
|
- elif opt.omega:
|
|
- toolname = "exp-omega"
|
|
- flags = os.getenv("SAGE_OMEGA_FLAGS", "")
|
|
cmd = "exec valgrind --tool=%s "%(toolname)
|
|
flags += ''' --log-file="%s" ''' % logfile
|
|
- if opt.omega:
|
|
- toolname = "omega"
|
|
if "%s" in flags:
|
|
flags %= toolname + ".%p" # replace %s with toolname
|
|
cmd += flags + sage_cmd
|
|
@@ -888,10 +882,10 @@ class DocTestController(SageObject):
|
|
0
|
|
"""
|
|
opt = self.options
|
|
- L = (opt.gdb, opt.valgrind, opt.massif, opt.cachegrind, opt.omega)
|
|
+ L = (opt.gdb, opt.valgrind, opt.massif, opt.cachegrind)
|
|
if any(L):
|
|
if L.count(True) > 1:
|
|
- self.log("You may only specify one of gdb, valgrind/memcheck, massif, cachegrind, omega")
|
|
+ self.log("You may only specify one of gdb, valgrind/memcheck, massif, cachegrind")
|
|
return 2
|
|
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 2014-08-12 14:06:23.391946291 -0300
|
|
+++ src/sage/interfaces/singular.py 2014-08-12 14:08:26.055950988 -0300
|
|
@@ -2147,7 +2147,7 @@ def generate_docstring_dictionary():
|
|
nodes.clear()
|
|
node_names.clear()
|
|
|
|
- singular_docdir = os.environ["SAGE_LOCAL"]+"/share/singular/"
|
|
+ singular_docdir = os.environ["SINGULAR_BIN_DIR"]+"/info/"
|
|
|
|
new_node = re.compile("File: singular\.hlp, Node: ([^,]*),.*")
|
|
new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
|
|
diff -up src/sage/misc/latex_macros.py.orig src/sage/misc/latex_macros.py
|
|
--- src/sage/misc/latex_macros.py.orig 2014-08-12 14:06:23.402946292 -0300
|
|
+++ src/sage/misc/latex_macros.py 2014-08-12 14:08:46.103951756 -0300
|
|
@@ -142,7 +142,7 @@ def convert_latex_macro_to_mathjax(macro
|
|
return name + ': ["' + defn + '",' + str(num_args) + ']'
|
|
|
|
from superseded import deprecated_function_alias
|
|
-convert_latex_macro_to_jsmath = deprecated_function_alias(13508, convert_latex_macro_to_mathjax)
|
|
+convert_latex_macro_to_jsmath = convert_latex_macro_to_mathjax
|
|
|
|
# To add a new macro for use in the Sage documentation, add a list or
|
|
# tuple to the following list. Each list (or tuple) should have the
|