[sagemath] 04/13: Refresh d* patches for sagemath 8.1.beta7.
Tobias Hansen
thansen at moszumanska.debian.org
Sun Oct 15 19:18:56 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 cdc94870e77d258fb4f0a1879a31be813e9344db
Author: Tobias Hansen <thansen at debian.org>
Date: Sun Oct 15 11:05:56 2017 +0000
Refresh d* patches for sagemath 8.1.beta7.
---
debian/changelog | 3 +++
debian/patches/d0-arb.patch | 6 ++---
debian/patches/d0-libgap-sage.patch | 13 +++++-----
debian/patches/d0-maxima.patch | 24 ++++++++---------
debian/patches/d0-nauty.patch | 2 +-
debian/patches/d0-paths-sharedata.patch | 2 +-
debian/patches/d0-paths.patch | 21 +++------------
debian/patches/d0-singular.patch | 4 +--
debian/patches/d1-install-paths.patch | 24 ++++++++---------
debian/patches/d1-sage-cli.patch | 30 +++++++++++-----------
debian/patches/d1-sage-env.patch | 26 +++++++++----------
debian/patches/d1-test-optional.patch | 2 +-
debian/patches/df-python_security.patch | 2 +-
debian/patches/df-revert-lazy-imports-22755.patch | 6 +++--
...t-minor-feature-dependent-on-python-patch.patch | 2 +-
debian/patches/df-silence_debian_bug_780186.patch | 20 ---------------
debian/patches/df-silence_ecl_opt_signals.patch | 4 +--
debian/patches/df-subprocess-sphinx.patch | 2 +-
debian/patches/series | 2 --
19 files changed, 81 insertions(+), 114 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 713ea87..06ccfdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,11 @@ sagemath (8.1~beta7-1) UNRELEASED; urgency=medium
- u1-pip-nowarn.patch #21835
- u1-more-sphinx-1.5-fixes.patch #23364
- u2-fix-less-trivial-test-cases.patch
+ - d0-cython-sys-path.patch (not deleted yet, test first)
+ - df-silence_debian_bug_780186.patch
* Patches with non-trivial modifications:
- u2-allow-override-sage-local.patch
+ - d0-paths.patch
-- Tobias Hansen <thansen at debian.org> Sun, 15 Oct 2017 10:23:00 +0000
diff --git a/debian/patches/d0-arb.patch b/debian/patches/d0-arb.patch
index ae12626..cb6c008 100644
--- a/debian/patches/d0-arb.patch
+++ b/debian/patches/d0-arb.patch
@@ -6,16 +6,16 @@ Forwarded: not-needed
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
-@@ -132,7 +132,7 @@
+@@ -80,7 +80,7 @@
"ec", "ecm",
- ] + linbox_libs + fflas_ffpack_libs + gsl_libs + [
+ ] + aliases["LINBOX_LIBRARIES"] + aliases["FFLASFFPACK_LIBRARIES"] + aliases["GSL_LIBRARIES"] + [
"pari", "flint", "ratpoints", "ecl", "glpk", "ppl",
- "arb", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
+ "flint-arb", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
"brial",
"brial_groebner",
"m4rie",
-@@ -805,7 +805,7 @@
+@@ -777,7 +777,7 @@
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
diff --git a/debian/patches/d0-libgap-sage.patch b/debian/patches/d0-libgap-sage.patch
index f6cd720..014a4cb 100644
--- a/debian/patches/d0-libgap-sage.patch
+++ b/debian/patches/d0-libgap-sage.patch
@@ -34,9 +34,9 @@ Forwarded: not-needed
rm main.o main *~
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
-@@ -46,6 +46,10 @@
- gsl_library_dirs = gsl_pc['library_dirs']
- gsl_include_dirs = gsl_pc['include_dirs']
+@@ -26,6 +26,10 @@
+ lapack_library_dirs = lapack_pc['library_dirs']
+ lapack_include_dirs = lapack_pc['include_dirs']
+# LibGAP
+libgap_pc = pkgconfig.parse('libgap-sage')
@@ -45,7 +45,7 @@ Forwarded: not-needed
# GD image library
gd_pc = pkgconfig.parse('gdlib')
gd_libs = gd_pc['libraries']
-@@ -136,8 +140,8 @@
+@@ -84,8 +88,8 @@
"brial_groebner",
"m4rie",
] + m4ri_libs + [
@@ -56,7 +56,7 @@ Forwarded: not-needed
"m", "readline", "Lfunction" ,
] + cblas_libs + zlib_libs
-@@ -643,15 +647,15 @@
+@@ -615,15 +619,15 @@
Extension('sage.libs.gap.util',
sources = ["sage/libs/gap/util.pyx"],
@@ -77,7 +77,7 @@ Forwarded: not-needed
##
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -86,12 +86,18 @@
+@@ -83,11 +83,17 @@
compile_result_dir = None
keep_going = False
@@ -88,7 +88,6 @@ Forwarded: not-needed
+libgap_include_dirs = list(libgap_pc['include_dirs'])
+
# search for dependencies and add to gcc -I<path>
- # this depends on SAGE_CYTHONIZED
-include_dirs = sage_include_directories(use_sources=True)
+include_dirs = sage_include_directories(use_sources=True) + libgap_include_dirs
diff --git a/debian/patches/d0-maxima.patch b/debian/patches/d0-maxima.patch
index c850ad5..216efb2 100644
--- a/debian/patches/d0-maxima.patch
+++ b/debian/patches/d0-maxima.patch
@@ -15,16 +15,16 @@ Author: Tobias Hansen <thansen at debian.org>
ecl_eval("(defvar *MAXIMA-LANG-SUBDIR* NIL)")
--- a/sage/src/sage/interfaces/maxima.py
+++ b/sage/src/sage/interfaces/maxima.py
-@@ -555,7 +555,7 @@
+@@ -556,7 +556,7 @@
Expect.__init__(self,
name = 'maxima',
prompt = '\(\%i[0-9]+\) ',
- command = 'maxima --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
+ command = 'maxima-sage --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
+ env = {'TMPDIR': str(ECL_TMP)},
script_subdirectory = script_subdirectory,
restart_on_ctrlc = False,
- verbose_start = False,
-@@ -788,7 +788,7 @@
+@@ -790,7 +790,7 @@
if not wait_for_prompt:
return
# line_echo sometimes has randomly inserted terminal echo in front #15811
@@ -35,7 +35,7 @@ Author: Tobias Hansen <thansen at debian.org>
out = self._before() # input echo + output prompt + output
--- a/sage/src/sage/interfaces/maxima_abstract.py
+++ b/sage/src/sage/interfaces/maxima_abstract.py
-@@ -164,7 +164,7 @@
+@@ -166,7 +166,7 @@
-- Function: gcd (<p_1>, <p_2>, <x_1>, ...)
...
"""
@@ -44,9 +44,9 @@ Author: Tobias Hansen <thansen at debian.org>
if sage.server.support.EMBEDDED_MODE:
cmd += '< /dev/null'
-@@ -172,10 +172,7 @@
- p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+@@ -179,10 +179,7 @@
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
res = p.stdout.read()
- # We get 4 lines of commented verbosity
- # every time Maxima starts, so we need to get rid of them
@@ -55,8 +55,8 @@ Author: Tobias Hansen <thansen at debian.org>
+ res = '\n'.join([line for line in res.split('\n') if line != '' and not line.startswith(';;;') and not line.startswith('(%i1)')])
return AsciiArtString(res)
else:
- subprocess.Popen(cmd, shell=True)
-@@ -2189,7 +2186,7 @@
+ subprocess.Popen(cmd, shell=True, env=env)
+@@ -2195,7 +2192,7 @@
sage: maxima_version()
'5.39.0'
"""
@@ -65,7 +65,7 @@ Author: Tobias Hansen <thansen at debian.org>
def maxima_console():
"""
-@@ -2205,4 +2202,4 @@
+@@ -2211,4 +2208,4 @@
from sage.repl.rich_output.display_manager import get_display_manager
if not get_display_manager().is_in_terminal():
raise RuntimeError('Can use the console only in the terminal. Try %%maxima magics instead.')
@@ -73,7 +73,7 @@ Author: Tobias Hansen <thansen at debian.org>
+ os.system('maxima-sage')
--- a/sage/src/sage/interfaces/expect.py
+++ b/sage/src/sage/interfaces/expect.py
-@@ -566,7 +566,7 @@
+@@ -568,7 +568,7 @@
sage: a = maxima('y')
sage: maxima.quit(verbose=True)
@@ -84,7 +84,7 @@ Author: Tobias Hansen <thansen at debian.org>
...
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -542,7 +542,7 @@
+@@ -543,7 +543,7 @@
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
diff --git a/debian/patches/d0-nauty.patch b/debian/patches/d0-nauty.patch
index 6ede97d..9d77dda 100644
--- a/debian/patches/d0-nauty.patch
+++ b/debian/patches/d0-nauty.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/graphs/graph_generators.py
+++ b/sage/src/sage/graphs/graph_generators.py
-@@ -879,10 +879,10 @@
+@@ -880,10 +880,10 @@
sage: gen = graphs.nauty_geng("4", debug=True)
sage: print(next(gen))
diff --git a/debian/patches/d0-paths-sharedata.patch b/debian/patches/d0-paths-sharedata.patch
index 30e6043..6fda61a 100644
--- a/debian/patches/d0-paths-sharedata.patch
+++ b/debian/patches/d0-paths-sharedata.patch
@@ -10,7 +10,7 @@ Author: Ximin Luo <infinity0 at debian.org>
Forwarded: TODO
--- a/sage/src/sage/combinat/designs/latin_squares.py
+++ b/sage/src/sage/combinat/designs/latin_squares.py
-@@ -547,8 +547,7 @@
+@@ -546,8 +546,7 @@
return
if compare:
diff --git a/debian/patches/d0-paths.patch b/debian/patches/d0-paths.patch
index 85f5f70..7fed0c7 100644
--- a/debian/patches/d0-paths.patch
+++ b/debian/patches/d0-paths.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/interfaces/gap.py
+++ b/sage/src/sage/interfaces/gap.py
-@@ -195,7 +195,7 @@
+@@ -196,7 +196,7 @@
WORKSPACE = gap_workspace_file()
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -484,7 +484,7 @@
+@@ -483,7 +483,7 @@
file_list = []
for fname in additional_source_files:
fname = fname.replace("$SAGE_SRC", SAGE_SRC)
@@ -48,21 +48,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Tests related to the not tested examples (nondeterministic order of atoms)::
sage: from sage.interfaces.qepcad import _qepcad_atoms
---- a/sage/src/sage/tests/cmdline.py
-+++ b/sage/src/sage/tests/cmdline.py
-@@ -570,12 +570,6 @@
- sage: ret
- 0
-
-- Check that ``sage-location`` did its job in making Python scripts
-- relative. We test it on the ``ipython`` script::
--
-- sage: open(os.path.join(SAGE_LOCAL, "bin", "ipython")).readline()
-- '#!/usr/bin/env python\n'
--
- Test GP using the ``-f`` option which prevents the reading of a ``.gprc``
- configuration file::
-
--- a/sage/src/sage/interfaces/jmoldata.py
+++ b/sage/src/sage/interfaces/jmoldata.py
@@ -148,7 +148,7 @@
@@ -87,4 +72,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ PYTHON="/usr/bin/python2"
fi
-
+ # Check that Python is actually installed and issue an error message if not--in
diff --git a/debian/patches/d0-singular.patch b/debian/patches/d0-singular.patch
index 7d48d8c..8ffe5a0 100644
--- a/debian/patches/d0-singular.patch
+++ b/debian/patches/d0-singular.patch
@@ -40,10 +40,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
# Add cysignals directory to includes
for path in sys.path:
- inc.append(path)
+ cysignals_path = os.path.join(path, "cysignals")
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
-@@ -152,7 +152,7 @@
+@@ -177,7 +177,7 @@
else:
extension = "so"
# library name changed from libsingular to libSingular btw 3.x and 4.x
diff --git a/debian/patches/d1-install-paths.patch b/debian/patches/d1-install-paths.patch
index f7b86b9..bb1cb58 100644
--- a/debian/patches/d1-install-paths.patch
+++ b/debian/patches/d1-install-paths.patch
@@ -9,7 +9,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
-@@ -86,7 +86,7 @@
+@@ -98,7 +98,7 @@
sage: from sage.misc.sageinspect import loadable_module_extension
sage: skip_extensions = (loadable_module_extension(),)
sage: for f in stale_iter:
@@ -17,10 +17,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ ....: if f.endswith(skip_extensions) or f.endswith(".pyo"): continue
....: print('Found stale file: ' + f)
"""
- from sage.misc.sageinspect import loadable_module_extension
+
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -196,9 +196,9 @@
+@@ -192,9 +192,9 @@
# (that are likely to change on an upgrade) here:
# [At least at the moment. Make sure the headers aren't copied with "-p",
# or explicitly touch them in the respective spkg's spkg-install.]
@@ -45,7 +45,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# containing this shell script. If unset, we will try to figure it out
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
-@@ -104,9 +104,9 @@
+@@ -131,9 +131,9 @@
except AttributeError: # in case of use inside virtualenv
sitepackages_dirs = [os.path.join(os.path.dirname(site.__file__),
'site-packages')]
@@ -55,9 +55,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-_add_variable_or_fallback('SAGE_LIB', SITE_PACKAGES[0])
+_add_variable_or_fallback('SAGE_LIB', opj('$SAGE_LOCAL', 'lib', 'python2.7', 'dist-packages'))
- _add_variable_or_fallback('SAGE_CYTHONIZED', opj('$SAGE_ROOT', 'src', 'build', 'cythonized'))
-
-@@ -222,8 +222,8 @@
+ # Used by sage/misc/package.py. Should be SAGE_SRC_ROOT in VPATH.
+ _add_variable_or_fallback('SAGE_PKGS', opj('$SAGE_ROOT', 'build', 'pkgs'))
+@@ -247,8 +247,8 @@
['.../include',
'.../include/python...',
'.../python.../numpy/core/include',
@@ -70,7 +70,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
import distutils.sysconfig
--- a/sage/configure.ac
+++ b/sage/configure.ac
-@@ -1025,8 +1025,7 @@
+@@ -1037,8 +1037,7 @@
AC_MSG_ERROR([[Cannot perform incremental update, run "make distclean && make"]])
fi
else
@@ -137,7 +137,7 @@ 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
-@@ -148,20 +148,19 @@
+@@ -155,20 +155,19 @@
EXAMPLES::
@@ -173,7 +173,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Python file parsing
triple_quotes = re.compile("\s*[rRuU]*((''')|(\"\"\"))")
-@@ -86,7 +86,7 @@
+@@ -89,7 +89,7 @@
# If the file is in the sage library, we can use our knowledge of
# the directory structure
dev = os.path.normpath(SAGE_SRC)
@@ -198,10 +198,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
file = filename
--- a/sage/src/Makefile.in
+++ b/sage/src/Makefile.in
-@@ -39,7 +39,7 @@
+@@ -37,7 +37,7 @@
+ SAGE_DOC_SRC=/doesnotexist \
SAGE_BUILD_DIR=/doesnotexist \
SAGE_PKGS=$(abs_top_srcdir)/build/pkgs \
- SAGE_CYTHONIZED=$(abs_builddir)/build/cythonized \
- && sage-python23 -u setup.py --no-user-cfg build install
+ && sage-python23 -u setup.py --no-user-cfg build install --root ../../debian/build --install-layout deb -O2
if [ "$$UNAME" = "CYGWIN" ]; then \
diff --git a/debian/patches/d1-sage-cli.patch b/debian/patches/d1-sage-cli.patch
index dc7f464..62b20ed 100644
--- a/debian/patches/d1-sage-cli.patch
+++ b/debian/patches/d1-sage-cli.patch
@@ -140,7 +140,7 @@ Forwarded: not-needed
echo " --initial - only show the first failure per block"
echo " --debug - drop into PDB after an unexpected error"
echo " --failed - only test files that failed last test"
-@@ -200,9 +136,6 @@
+@@ -201,9 +137,6 @@
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
echo "Documentation:"
@@ -150,7 +150,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"
-@@ -225,16 +158,6 @@
+@@ -226,16 +159,6 @@
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@@ -167,7 +167,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"
-@@ -275,91 +198,6 @@
+@@ -276,91 +199,6 @@
exit $status
fi
@@ -259,7 +259,7 @@ Forwarded: not-needed
#####################################################################
# Source sage-env ($0 is the name of this "sage" script, so we can just
-@@ -385,29 +223,9 @@
+@@ -386,29 +224,9 @@
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
@@ -289,7 +289,7 @@ Forwarded: not-needed
sage-cleaner &>/dev/null &
}
-@@ -485,11 +303,6 @@
+@@ -486,11 +304,6 @@
exec gap "$@"
fi
@@ -301,7 +301,7 @@ Forwarded: not-needed
if [ "$1" = '-gp' -o "$1" = '--gp' ]; then
shift
exec gp "$@"
-@@ -535,11 +348,6 @@
+@@ -536,11 +349,6 @@
exec kash "$@"
fi
@@ -313,7 +313,7 @@ Forwarded: not-needed
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima-sage "$@"
-@@ -555,21 +363,6 @@
+@@ -556,21 +364,6 @@
exec M2 "$@"
fi
@@ -335,7 +335,7 @@ Forwarded: not-needed
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
exec python "$@"
-@@ -600,11 +393,6 @@
+@@ -601,11 +394,6 @@
exec git "$@"
fi
@@ -347,7 +347,7 @@ Forwarded: not-needed
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
# AUTHORS:
# - Carl Witty and William Stein: initial version
-@@ -724,20 +512,6 @@
+@@ -725,20 +513,6 @@
fi
#####################################################################
@@ -368,7 +368,7 @@ Forwarded: not-needed
# File conversion
#####################################################################
-@@ -760,11 +534,6 @@
+@@ -761,11 +535,6 @@
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@@ -380,7 +380,7 @@ Forwarded: not-needed
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
sage-cleaner &>/dev/null &
exec sage-notebook "$@"
-@@ -775,13 +544,6 @@
+@@ -776,13 +545,6 @@
exec sage-notebook "$@"
fi
@@ -394,7 +394,7 @@ Forwarded: not-needed
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
-@@ -800,34 +562,15 @@
+@@ -801,34 +563,15 @@
exit 0
fi
@@ -431,7 +431,7 @@ Forwarded: not-needed
shift
exec sage-runtests -p "$@"
else
-@@ -836,16 +579,6 @@
+@@ -837,16 +580,6 @@
fi
fi
@@ -448,7 +448,7 @@ Forwarded: not-needed
if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
shift
SAGE_BANNER=no sage_setup
-@@ -860,114 +593,6 @@
+@@ -861,114 +594,6 @@
exec sage-eval "$@"
fi
@@ -563,7 +563,7 @@ Forwarded: not-needed
if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
shift
exec python -m "sage_setup.docbuild" "$@"
-@@ -1039,10 +664,6 @@
+@@ -1040,10 +665,6 @@
fi
if [ $# -ge 1 ]; then
diff --git a/debian/patches/d1-sage-env.patch b/debian/patches/d1-sage-env.patch
index 6c5d618..8dce2a0 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
-@@ -204,7 +204,12 @@
+@@ -205,7 +205,12 @@
# append -env to that). We redirect stdout to stderr, which is safer
# for scripts.
#####################################################################
@@ -23,7 +23,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
echo >&2 "possibly contact sage-devel (see http://groups.google.com/group/sage-devel)."
--- a/sage/src/bin/sage-env
+++ b/sage/src/bin/sage-env
-@@ -266,12 +266,12 @@
+@@ -304,12 +304,12 @@
# depending on SAGE_ROOT and SAGE_LOCAL which are already defined.
export SAGE_ETC="$SAGE_LOCAL/etc"
export SAGE_SHARE="$SAGE_LOCAL/share"
@@ -38,7 +38,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
-@@ -327,12 +327,12 @@
+@@ -365,12 +365,12 @@
fi
# For PARI/GP
@@ -56,7 +56,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
-@@ -347,16 +347,6 @@
+@@ -385,16 +385,6 @@
export SAGE_DISTFILES
fi
@@ -73,7 +73,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
if [ "$DOT_SAGE" = "" ]; then
# It is *not* an error if this directory does not exist, it will
# be created in src/bin/sage or src/sage/misc/misc.py.
-@@ -417,8 +407,10 @@
+@@ -437,8 +427,10 @@
unset PYTHONHOME
fi
@@ -83,9 +83,9 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
+LD_LIBRARY_PATH="$SAGE_LOCAL/lib:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH
- # Use a matplotlib config directory specific to Sage and specific to
- # the version number of matplotlib, by setting the environment
-@@ -465,7 +457,6 @@
+ if [ -z "$IPYTHONDIR" ]; then
+ # We hardcode a version number in the directory name. The idea is
+@@ -499,7 +491,6 @@
fi
fi
fi
@@ -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
-@@ -644,9 +635,6 @@
+@@ -619,9 +610,6 @@
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
fi
@@ -160,7 +160,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
-@@ -840,7 +840,7 @@
+@@ -848,7 +848,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
@@ -171,7 +171,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
run ``make doc-clean``, because the presence, or lack, of pictures
--- a/sage/src/sage/structure/sage_object.pyx
+++ b/sage/src/sage/structure/sage_object.pyx
-@@ -1595,7 +1595,7 @@
+@@ -1597,7 +1597,7 @@
When run with no arguments :meth:`unpickle_all` tests that all of the
"standard" pickles stored in the pickle_jar at
@@ -182,7 +182,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
--- a/sage/src/sage_setup/docbuild/__init__.py
+++ b/sage/src/sage_setup/docbuild/__init__.py
-@@ -412,7 +412,7 @@
+@@ -413,7 +413,7 @@
document_name = document.split('/')[1]
# the sage directory within a subdocument, for example
@@ -201,7 +201,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
from . import version
opj = os.path.join
-@@ -135,12 +136,12 @@
+@@ -160,12 +161,12 @@
_add_variable_or_fallback('SAGE_IMPORTALL', 'yes')
# additional packages locations
diff --git a/debian/patches/d1-test-optional.patch b/debian/patches/d1-test-optional.patch
index 50703e2..e988418 100644
--- a/debian/patches/d1-test-optional.patch
+++ b/debian/patches/d1-test-optional.patch
@@ -3,7 +3,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
--- a/sage/src/sage/doctest/control.py
+++ b/sage/src/sage/doctest/control.py
-@@ -322,22 +322,6 @@
+@@ -323,22 +323,6 @@
if "all" in options.optional:
# Special case to run all optional tests
options.optional = True
diff --git a/debian/patches/df-python_security.patch b/debian/patches/df-python_security.patch
index 3aad7d2..ac761d3 100644
--- a/debian/patches/df-python_security.patch
+++ b/debian/patches/df-python_security.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/doctest/control.py
+++ b/sage/src/sage/doctest/control.py
-@@ -557,19 +557,20 @@
+@@ -558,19 +558,20 @@
``sage/tests/cmdline.py`` for a doctest that this works, see
also :trac:`13579`.
diff --git a/debian/patches/df-revert-lazy-imports-22755.patch b/debian/patches/df-revert-lazy-imports-22755.patch
index fb9dca4..7de8c35 100644
--- a/debian/patches/df-revert-lazy-imports-22755.patch
+++ b/debian/patches/df-revert-lazy-imports-22755.patch
@@ -46,15 +46,17 @@ Subject: Fix traceback
--- a/sage/src/sage/dynamics/all.py
+++ b/sage/src/sage/dynamics/all.py
-@@ -1,2 +1,3 @@
+@@ -1,4 +1,5 @@
-from sage.dynamics.interval_exchanges.all import *
-from sage.dynamics.flat_surfaces.all import *
+from sage.misc.lazy_import import lazy_import
+lazy_import("sage.dynamics.interval_exchanges.all", "*", overwrite=False)
+lazy_import("sage.dynamics.flat_surfaces.all", "*", overwrite=False)
+ from sage.dynamics.arithmetic_dynamics.all import *
+ from sage.dynamics.complex_dynamics.all import *
--- a/sage/src/sage/libs/mpmath/utils.pyx
+++ b/sage/src/sage/libs/mpmath/utils.pyx
-@@ -17,6 +17,7 @@
+@@ -15,6 +15,7 @@
from sage.libs.mpfr cimport *
from sage.libs.gmp.all cimport *
diff --git a/debian/patches/df-revert-minor-feature-dependent-on-python-patch.patch b/debian/patches/df-revert-minor-feature-dependent-on-python-patch.patch
index e9e0124..fdacefc 100644
--- a/debian/patches/df-revert-minor-feature-dependent-on-python-patch.patch
+++ b/debian/patches/df-revert-minor-feature-dependent-on-python-patch.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/rings/integer.pyx
+++ b/sage/src/sage/rings/integer.pyx
-@@ -762,16 +762,6 @@
+@@ -765,16 +765,6 @@
4
sage: v[Integer(2):Integer(4)]
[3, 4]
diff --git a/debian/patches/df-silence_debian_bug_780186.patch b/debian/patches/df-silence_debian_bug_780186.patch
deleted file mode 100644
index 6682404..0000000
--- a/debian/patches/df-silence_debian_bug_780186.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/sage/src/sage/ext/memory.pyx
-+++ b/sage/src/sage/ext/memory.pyx
-@@ -1,17 +1,6 @@
- """
- Low-level memory allocation functions
-
--TESTS:
--
--Check that a ``MemoryError`` is raised if we try to allocate a
--ridiculously large integer, see :trac:`15363`::
--
-- sage: 2^(2^63-2)
-- Traceback (most recent call last):
-- ...
-- RuntimeError: exponent must be at most 2147483647 # 32-bit
-- MemoryError: failed to allocate 1152921504606847008 bytes # 64-bit
--
- AUTHORS:
-
- - Jeroen Demeyer (2011-01-13): initial version (:trac:`10258`)
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/df-subprocess-sphinx.patch b/debian/patches/df-subprocess-sphinx.patch
index 72bf359..74e4d41 100644
--- a/debian/patches/df-subprocess-sphinx.patch
+++ b/debian/patches/df-subprocess-sphinx.patch
@@ -14,7 +14,7 @@ Forwarded: TBD
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage_setup/docbuild/__init__.py
+++ b/sage/src/sage_setup/docbuild/__init__.py
-@@ -98,10 +98,9 @@
+@@ -99,10 +99,9 @@
logger.debug(build_command)
# Run Sphinx with Sage's special logger
diff --git a/debian/patches/series b/debian/patches/series
index 54b82fe..ea8acab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,7 +26,6 @@ u2-better-sphinx-failure-modes.patch
# These won't change even if Debian and Sage use the same version
# Not suitable for upstreaming
d0-arb.patch
-d0-cython-sys-path.patch
d0-gsl-cblas.patch
d0-libgap-sage.patch
d0-maxima.patch
@@ -58,7 +57,6 @@ df-revert-lazy-import-dependent-on-python-patch.patch
df-revert-minor-feature-dependent-on-python-patch.patch
df-python_security.patch
df-sage-gap-reset-doctest.patch
-df-silence_debian_bug_780186.patch
df-silence_ecl_opt_signals.patch
df-subprocess-sphinx.patch
--
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