[sagemath] 05/07: Refresh remaining patches for sage 7.6.rc1.
Tobias Hansen
thansen at moszumanska.debian.org
Sat Mar 18 13:54:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository sagemath.
commit 5c86ad4b7169afed3dae8806f6ff739f92f1e161
Author: Tobias Hansen <thansen at debian.org>
Date: Sat Mar 18 13:04:33 2017 +0000
Refresh remaining patches for sage 7.6.rc1.
---
debian/patches/d1-disable-post-install-tests.patch | 2 +-
debian/patches/d1-doc-docs.patch | 2 +-
debian/patches/d1-install-paths.patch | 23 ++++----
debian/patches/d1-multiarch-python-paths.patch | 4 +-
debian/patches/d1-sage-cli.patch | 61 ++++++++++++++--------
debian/patches/d1-sage-env.patch | 16 +++---
debian/patches/df-python_security.patch | 2 +-
...ert-lazy-import-dependent-on-python-patch.patch | 2 +-
debian/patches/df-sagedoc_avoid_exception.patch | 2 +-
debian/patches/df-silence_ecl_opt_signals.patch | 4 +-
.../dt-version-singular-4-extra-fixes.patch | 2 +-
.../patches/dt-work-around-doc-common-conf.patch | 9 ++--
12 files changed, 75 insertions(+), 54 deletions(-)
diff --git a/debian/patches/d1-disable-post-install-tests.patch b/debian/patches/d1-disable-post-install-tests.patch
index e6ce6e8..36fb772 100644
--- a/debian/patches/d1-disable-post-install-tests.patch
+++ b/debian/patches/d1-disable-post-install-tests.patch
@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"""
--- a/sage/src/sage/all.py
+++ b/sage/src/sage/all.py
-@@ -274,14 +274,6 @@
+@@ -272,14 +272,6 @@
The non-existence of this file will be used as a trigger to run
``sage-starts`` during the Sage build.
diff --git a/debian/patches/d1-doc-docs.patch b/debian/patches/d1-doc-docs.patch
index d342f7f..b7e4b49 100644
--- a/debian/patches/d1-doc-docs.patch
+++ b/debian/patches/d1-doc-docs.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/misc/sagedoc.py
+++ b/sage/src/sage/misc/sagedoc.py
-@@ -1471,8 +1471,8 @@
+@@ -1499,8 +1499,8 @@
url = self._base_url + os.path.join(name, "index.html")
path = os.path.join(self._base_path, name, "index.html")
if not os.path.exists(path):
diff --git a/debian/patches/d1-install-paths.patch b/debian/patches/d1-install-paths.patch
index f7d339b..7d97037 100644
--- a/debian/patches/d1-install-paths.patch
+++ b/debian/patches/d1-install-paths.patch
@@ -12,7 +12,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage_setup/clean.py
+++ b/sage/src/sage_setup/clean.py
-@@ -85,7 +85,7 @@
+@@ -86,7 +86,7 @@
sage: from sage.misc.sageinspect import loadable_module_extension
sage: skip_extensions = (loadable_module_extension(),)
sage: for f in stale_iter:
@@ -69,7 +69,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
_add_variable_or_fallback('SAGE_CYTHONIZED', opj('$SAGE_ROOT', 'src', 'build', 'cythonized'))
-@@ -212,8 +212,8 @@
+@@ -213,8 +213,8 @@
['.../include',
'.../include/python...',
'.../python.../numpy/core/include',
@@ -149,12 +149,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
'-f', '{connection_file}',
--- a/sage/src/sage_setup/find.py
+++ b/sage/src/sage_setup/find.py
-@@ -147,19 +147,18 @@
+@@ -148,20 +148,19 @@
EXAMPLES::
- sage: from site import getsitepackages
- sage: site_packages = getsitepackages()[0]
+ sage: from sage_setup.find import installed_files_by_module
- sage: files_by_module = installed_files_by_module(site_packages)
+ sage: from sage.env import SAGE_LIB
+ sage: files_by_module = installed_files_by_module(SAGE_LIB)
@@ -175,7 +176,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"""
--- a/sage/src/sage/doctest/sources.py
+++ b/sage/src/sage/doctest/sources.py
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
from .parsing import SageDocTestParser
from .util import NestedName
from sage.structure.dynamic_class import dynamic_class
@@ -184,7 +185,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Python file parsing
triple_quotes = re.compile("\s*[rRuU]*((''')|(\"\"\"))")
-@@ -85,7 +85,7 @@
+@@ -86,7 +86,7 @@
# If the file is in the sage library, we can use our knowledge of
# the directory structure
dev = os.path.normpath(SAGE_SRC)
@@ -209,7 +210,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
file = filename
--- a/sage/src/sage_setup/docbuild/ext/multidocs.py
+++ b/sage/src/sage_setup/docbuild/ext/multidocs.py
-@@ -282,7 +282,7 @@
+@@ -283,7 +283,7 @@
"""
app.builder.info(bold('linking _static directory.'))
static_dir = os.path.join(app.builder.outdir, '_static')
@@ -224,14 +225,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
SAGE_BUILD_DIR=/doesnotexist \
SAGE_PKGS=$(abs_top_srcdir)/build/pkgs \
SAGE_CYTHONIZED=$(abs_builddir)/build/cythonized \
-- && python -u setup.py build install)
-+ && python -u setup.py build install --root ../../debian/build --install-layout deb -O2)
+- && python -u setup.py --no-user-cfg build install)
++ && python -u setup.py --no-user-cfg build install --root ../../debian/build --install-layout deb -O2)
clean:
@echo "Deleting Sage library build artifacts..."
--- a/sage/src/sage/plot/plot3d/base.pyx
+++ b/sage/src/sage/plot/plot3d/base.pyx
-@@ -388,19 +388,13 @@
+@@ -386,19 +386,13 @@
if isinstance(backend, BackendIPythonNotebook):
scripts = ( """
<script src="/nbextensions/threejs/three.min.js"></script>
@@ -253,5 +254,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+<script src="{0}/examples/js/controls/OrbitControls.js"></script>
+ """.format( "file:///usr/share/javascript/three" ) )
- lights = "[{x:0, y:0, z:10}, {x:0, y:0, z:-10}]"
-
+ b = self.bounding_box()
+ bounds = '[{{"x":{}, "y":{}, "z":{}}}, {{"x":{}, "y":{}, "z":{}}}]'.format(
diff --git a/debian/patches/d1-multiarch-python-paths.patch b/debian/patches/d1-multiarch-python-paths.patch
index 0a19a5a..971b763 100644
--- a/debian/patches/d1-multiarch-python-paths.patch
+++ b/debian/patches/d1-multiarch-python-paths.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/misc/sageinspect.py
+++ b/sage/src/sage/misc/sageinspect.py
-@@ -122,6 +122,7 @@
+@@ -123,6 +123,7 @@
import tokenize
import types
import re
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
EMBEDDED_MODE = False
from sage.env import SAGE_SRC
-@@ -1247,7 +1248,12 @@
+@@ -1248,7 +1249,12 @@
except TypeError: # this happens for Python builtins
return ''
if sourcefile.endswith(loadable_module_extension()):
diff --git a/debian/patches/d1-sage-cli.patch b/debian/patches/d1-sage-cli.patch
index 7b22212..345caf1 100644
--- a/debian/patches/d1-sage-cli.patch
+++ b/debian/patches/d1-sage-cli.patch
@@ -149,7 +149,7 @@ Forwarded: not-needed
echo " -docbuild [lang/]<document> <html|pdf|...> -- Build the Sage documentation"
echo " -search_src <string> -- search through all the Sage library code for string"
echo " -search_doc <string> -- search through the Sage documentation for string"
-@@ -220,16 +153,6 @@
+@@ -222,16 +155,6 @@
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@@ -166,7 +166,7 @@ Forwarded: not-needed
echo "Valgrind memory debugging:"
echo " -cachegrind -- run Sage using Valgrind's cachegrind tool. The log"
echo " files are named sage-cachegrind.PID can be found in"
-@@ -270,74 +193,6 @@
+@@ -272,91 +195,6 @@
exit $status
fi
@@ -174,8 +174,26 @@ Forwarded: not-needed
-# an unclobbered environment before testing unsafe tickets.
-if [ "$1" = '-patchbot' -o "$1" = "--patchbot" ]; then
- shift
-- cd "$SAGE_ROOT"
-- exec local/bin/patchbot/patchbot.py "$@"
+- # We ask the Python from Sage where the patchbot is installed.
+- # We set PYTHONPATH to that directory such that the system Python
+- # should also find the sage_patchbot package.
+- cmd='import sage_patchbot as p; import os; print(os.path.dirname(p.__path__[0]))'
+- export PYTHONPATH=`"$SAGE_ROOT/sage" --python -c "$cmd"`
+- if [ -z "$PYTHONPATH" ]; then
+- # Something went wrong, assume that the patchbot is not installed
+- echo >&2 "Error: cannot find installation path for sage_patchbot"
+- echo >&2 "See https://wiki.sagemath.org/buildbot for instructions"
+- exit 1
+- fi
+-
+- # Try "python2.7", then "python2", then "python"
+- shopt -s execfail # Do not exit if "exec" fails
+- exec python2.7 -m sage_patchbot.patchbot "$@"
+- exec python2 -m sage_patchbot.patchbot "$@"
+- exec python -m sage_patchbot.patchbot "$@"
+- echo >&2 "Error: cannot find a suitable Python program."
+- echo >&2 "The SageMath patchbot requires a system Python installation."
+- exit 127
-fi
-
-# Check for '--upgrade' before sourcing sage-env: the top-level "make"
@@ -237,11 +255,10 @@ Forwarded: not-needed
- exit 0
-fi
-
--
+
#####################################################################
# Source sage-env ($0 is the name of this "sage" script, so we can just
- # append -env to that). We redirect stdout to stderr, which is safer
-@@ -362,47 +217,13 @@
+@@ -382,47 +220,13 @@
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
@@ -291,7 +308,7 @@ Forwarded: not-needed
# Start an interactive Sage session, this function never returns.
interactive_sage() {
sage_setup
-@@ -462,11 +283,6 @@
+@@ -482,11 +286,6 @@
exec gap "$@"
fi
@@ -303,7 +320,7 @@ Forwarded: not-needed
if [ "$1" = '-gp' -o "$1" = '--gp' ]; then
shift
exec gp "$@"
-@@ -512,11 +328,6 @@
+@@ -532,11 +331,6 @@
exec kash "$@"
fi
@@ -315,7 +332,7 @@ Forwarded: not-needed
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima-sage "$@"
-@@ -532,21 +343,6 @@
+@@ -552,21 +346,6 @@
exec M2 "$@"
fi
@@ -326,7 +343,7 @@ Forwarded: not-needed
-
-if [ "$1" = '-pip' -o "$1" = '--pip' ]; then
- shift
-- exec pip-lock "$@"
+- exec pip "$@"
-fi
-
-if [ "$1" = '-fix-pkg-checksums' -o "$1" = '--fix-pkg-checksums' ]; then
@@ -337,7 +354,7 @@ Forwarded: not-needed
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
exec python "$@"
-@@ -567,11 +363,6 @@
+@@ -587,11 +366,6 @@
exec git "$@"
fi
@@ -349,7 +366,7 @@ Forwarded: not-needed
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
# AUTHORS:
# - Carl Witty and William Stein: initial version
-@@ -691,20 +482,6 @@
+@@ -711,20 +485,6 @@
fi
#####################################################################
@@ -370,7 +387,7 @@ Forwarded: not-needed
# File conversion
#####################################################################
-@@ -722,11 +499,6 @@
+@@ -747,11 +507,6 @@
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@@ -382,7 +399,7 @@ Forwarded: not-needed
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
sage-cleaner &>/dev/null &
exec sage-notebook "$@"
-@@ -737,13 +509,6 @@
+@@ -762,13 +517,6 @@
exec sage-notebook "$@"
fi
@@ -396,7 +413,7 @@ Forwarded: not-needed
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
-@@ -762,38 +527,19 @@
+@@ -787,38 +535,19 @@
exit 0
fi
@@ -437,7 +454,7 @@ Forwarded: not-needed
shift
exec sage-runtests -p "$@"
else
-@@ -802,16 +548,6 @@
+@@ -827,16 +556,6 @@
fi
fi
@@ -454,7 +471,7 @@ Forwarded: not-needed
if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
shift
SAGE_BANNER=no sage_setup
-@@ -826,114 +562,6 @@
+@@ -851,114 +570,6 @@
exec sage-eval "$@"
fi
@@ -569,7 +586,7 @@ Forwarded: not-needed
if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
shift
exec python -m "sage_setup.docbuild" "$@"
-@@ -1005,10 +633,6 @@
+@@ -1030,10 +641,6 @@
fi
if [ $# -ge 1 ]; then
@@ -599,7 +616,7 @@ Forwarded: not-needed
--preparse
--python
-q
-@@ -198,36 +195,6 @@
+@@ -199,36 +196,6 @@
sage: ret
0
@@ -636,7 +653,7 @@ Forwarded: not-needed
Test ``sage-run`` on a Python file, both with an absolute and with a relative path::
sage: dir = tmp_dir(); name = 'python_test_file.py'
-@@ -414,50 +381,6 @@
+@@ -415,50 +382,6 @@
...
RuntimeError: refusing to run doctests...
@@ -687,7 +704,7 @@ Forwarded: not-needed
Test external programs being called by Sage::
sage: (out, err, ret) = test_executable(["sage", "--sh"], "echo Hello World\nexit 42\n")
-@@ -599,32 +522,6 @@
+@@ -600,32 +523,6 @@
sage: ret
0
diff --git a/debian/patches/d1-sage-env.patch b/debian/patches/d1-sage-env.patch
index 5072ff0..7c13f47 100644
--- a/debian/patches/d1-sage-env.patch
+++ b/debian/patches/d1-sage-env.patch
@@ -7,7 +7,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -198,7 +198,12 @@
+@@ -201,7 +201,12 @@
# append -env to that). We redirect stdout to stderr, which is safer
# for scripts.
#####################################################################
@@ -93,7 +93,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB
-@@ -642,9 +633,6 @@
+@@ -647,9 +638,6 @@
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
fi
@@ -127,7 +127,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
#---------------------------------------------------------
--- a/sage/README.md
+++ b/sage/README.md
-@@ -212,7 +212,7 @@
+@@ -223,7 +223,7 @@
__7.__ The HTML version of the documentation is built during the compilation
process of Sage and resides in the directory:
@@ -138,7 +138,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
of the documentation, run:
--- a/sage/build/make/deps
+++ b/sage/build/make/deps
-@@ -229,7 +229,7 @@
+@@ -230,7 +230,7 @@
cd "$(SAGE_SRC)/doc" && $(MAKE) clean
doc-output-clean:
@@ -171,7 +171,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
of the documentation, issue the following command from ``SAGE_ROOT``::
--- a/sage/src/doc/en/installation/source.rst
+++ b/sage/src/doc/en/installation/source.rst
-@@ -801,7 +801,7 @@
+@@ -830,7 +830,7 @@
primarily intended for use when producing certain binary
distributions of Sage, to lower the size of the distribution. As of
this writing (December 2014, Sage 6.5), there are only a few such
@@ -232,7 +232,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
from . import version
opj = os.path.join
-@@ -134,11 +135,11 @@
+@@ -134,12 +135,12 @@
_add_variable_or_fallback('SAGE_IMPORTALL', 'yes')
# additional packages locations
@@ -241,15 +241,17 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
-_add_variable_or_fallback('ELLCURVE_DATA_DIR',opj('$SAGE_SHARE','ellcurves'))
-_add_variable_or_fallback('POLYTOPE_DATA_DIR',opj('$SAGE_SHARE','reflexive_polytopes'))
-_add_variable_or_fallback('GAP_ROOT_DIR', opj('$SAGE_LOCAL','gap','latest'))
+-_add_variable_or_fallback('THEBE_DIR', opj('$SAGE_SHARE','thebe'))
+_add_variable_or_fallback('CONWAY_POLYNOMIALS_DATA_DIR', '/usr/share/sagemath/conway_polynomials')
+_add_variable_or_fallback('GRAPHS_DATA_DIR', '/usr/share/sagemath/graphs')
+_add_variable_or_fallback('ELLCURVE_DATA_DIR', '/usr/share/sagemath/ellcurves')
+_add_variable_or_fallback('POLYTOPE_DATA_DIR', '/usr/share/sagemath/reflexive_polytopes')
+_add_variable_or_fallback('GAP_ROOT_DIR', '/usr/share/gap')
++_add_variable_or_fallback('THEBE_DIR', '/usr/share/thebe')
# locate singular shared object
if UNAME[:6] == "CYGWIN":
-@@ -148,7 +149,7 @@
+@@ -149,7 +150,7 @@
else:
extension = "so"
# library name changed from libsingular to libSingular btw 3.x and 4.x
diff --git a/debian/patches/df-python_security.patch b/debian/patches/df-python_security.patch
index a2bb4ca..e30fbb4 100644
--- a/debian/patches/df-python_security.patch
+++ b/debian/patches/df-python_security.patch
@@ -35,7 +35,7 @@
with open(os.devnull, 'w') as dev_null:
--- a/sage/src/sage/tests/cmdline.py
+++ b/sage/src/sage/tests/cmdline.py
-@@ -363,23 +363,24 @@
+@@ -364,23 +364,24 @@
sage: ret
1
diff --git a/debian/patches/df-revert-lazy-import-dependent-on-python-patch.patch b/debian/patches/df-revert-lazy-import-dependent-on-python-patch.patch
index e461355..412dbcf 100644
--- a/debian/patches/df-revert-lazy-import-dependent-on-python-patch.patch
+++ b/debian/patches/df-revert-lazy-import-dependent-on-python-patch.patch
@@ -40,7 +40,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@@ -234,41 +235,39 @@
sage: type(Foo.__dict__['plot'])
- <type 'function'>
+ <... 'function'>
"""
- if self._object is not None:
- return self._object
diff --git a/debian/patches/df-sagedoc_avoid_exception.patch b/debian/patches/df-sagedoc_avoid_exception.patch
index 621a6e2..254ed21 100644
--- a/debian/patches/df-sagedoc_avoid_exception.patch
+++ b/debian/patches/df-sagedoc_avoid_exception.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/misc/sagedoc.py
+++ b/sage/src/sage/misc/sagedoc.py
-@@ -1551,7 +1551,8 @@
+@@ -1579,7 +1579,8 @@
if hasattr(module, '_sage_doc_'):
from sage.misc.sageinspect import sage_getdef, _sage_getdoc_unformatted
docstr = 'Help on ' + str(module) + '\n'
diff --git a/debian/patches/df-silence_ecl_opt_signals.patch b/debian/patches/df-silence_ecl_opt_signals.patch
index 491d8d7..9c8cdaf 100644
--- a/debian/patches/df-silence_ecl_opt_signals.patch
+++ b/debian/patches/df-silence_ecl_opt_signals.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/libs/ecl.pyx
+++ b/sage/src/sage/libs/ecl.pyx
-@@ -140,7 +140,7 @@
+@@ -141,7 +141,7 @@
ECL_OPT_TRAP_SIGBUS = 1
ECL_OPT_TRAP_SIGCHLD = 0
ECL_OPT_TRAP_SIGPIPE = 1
@@ -9,7 +9,7 @@
ECL_OPT_SIGNAL_HANDLING_THREAD = 0
ECL_OPT_SIGNAL_QUEUE_SIZE = 16
ECL_OPT_BOOTED = 1
-@@ -155,7 +155,7 @@
+@@ -156,7 +156,7 @@
ECL_OPT_SIGALTSTACK_SIZE = 1
ECL_OPT_HEAP_SIZE = ...
ECL_OPT_HEAP_SAFETY_AREA = ...
diff --git a/debian/patches/dt-version-singular-4-extra-fixes.patch b/debian/patches/dt-version-singular-4-extra-fixes.patch
index 77d8d8f..534b8d6 100644
--- a/debian/patches/dt-version-singular-4-extra-fixes.patch
+++ b/debian/patches/dt-version-singular-4-extra-fixes.patch
@@ -8,7 +8,7 @@ Forwarded: TODO, to Sage
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -300,7 +300,7 @@
+@@ -303,7 +303,7 @@
if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
shift
diff --git a/debian/patches/dt-work-around-doc-common-conf.patch b/debian/patches/dt-work-around-doc-common-conf.patch
index 46a7b52..3c2370f 100644
--- a/debian/patches/dt-work-around-doc-common-conf.patch
+++ b/debian/patches/dt-work-around-doc-common-conf.patch
@@ -8,7 +8,7 @@ Bug: https://trac.sagemath.org/ticket/21732
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/misc/sagedoc.py
+++ b/sage/src/sage/misc/sagedoc.py
-@@ -463,10 +463,15 @@
+@@ -491,10 +491,15 @@
"""
if embedded:
return s
@@ -66,11 +66,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
'sphinx.ext.extlinks']
--- a/sage/src/doc/common/conf.py
+++ b/sage/src/doc/common/conf.py
-@@ -1,10 +1,14 @@
+@@ -1,11 +1,15 @@
import sys, os, sphinx
--from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC
-+from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, SAGE_LIB
+-from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, THEBE_DIR
++from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, SAGE_LIB, THEBE_DIR
from datetime import date
+ from six import iteritems
# If your extensions are in another directory, add it here.
sys.path.append(os.path.join(SAGE_SRC, "sage_setup", "docbuild", "ext"))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git
More information about the debian-science-commits
mailing list