[sagemath] 01/02: Update patches (part 4).
Tobias Hansen
thansen at moszumanska.debian.org
Sat Jan 21 22:00:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch experimental
in repository sagemath.
commit f4e5e461a02ad57708da012acf51894c763e622e
Author: Tobias Hansen <thansen at debian.org>
Date: Sat Jan 21 21:22:55 2017 +0000
Update patches (part 4).
---
debian/changelog | 6 ++
debian/patches/d0-paths-sharedata.patch | 112 +--------------------
debian/patches/d0-paths.patch | 24 +----
debian/patches/d0-singular.patch | 32 +-----
debian/patches/d1-install-paths.patch | 19 +---
debian/patches/d1-sage-cli.patch | 52 +++++-----
debian/patches/d1-sage-env.patch | 14 +--
...t-minor-feature-dependent-on-python-patch.patch | 2 +-
debian/patches/dt-disable-parallel-sphinx.patch | 70 ++-----------
debian/patches/dt-more-fix-test-cases.patch | 39 -------
.../dt-version-singular-4-extra-fixes.patch | 2 +-
11 files changed, 62 insertions(+), 310 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 89f23cc..18f5399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,12 @@ sagemath (7.5.1-1) UNRELEASED; urgency=medium
- u2-fix-trivial-test-cases.patch
- u2-fix-less-trivial-test-cases.patch
- d0-pari.patch
+ - d0-paths-sharedata.patch
+ - d0-paths.patch
+ - d0-singular.patch
+ - d1-install-paths.patch
+ - dt-disable-parallel-sphinx.patch
+ - dt-more-fix-test-cases.patch (parts were applied upstream)
-- Tobias Hansen <thansen at debian.org> Wed, 18 Jan 2017 22:58:31 +0000
diff --git a/debian/patches/d0-paths-sharedata.patch b/debian/patches/d0-paths-sharedata.patch
index 8fd4dc2..2accc47 100644
--- a/debian/patches/d0-paths-sharedata.patch
+++ b/debian/patches/d0-paths-sharedata.patch
@@ -20,19 +20,6 @@ Forwarded: TODO
hb = [int(_) for _ in handbook_file.readlines()[9].split(',')]
handbook_file.close()
---- a/sage/src/sage/databases/conway.py
-+++ b/sage/src/sage/databases/conway.py
-@@ -22,9 +22,8 @@
- from six import itervalues
-
- import collections, os
--from sage.env import SAGE_SHARE
-
--_CONWAYDATA = os.path.join(SAGE_SHARE, 'conway_polynomials',
-+_CONWAYDATA = os.path.join('/usr/share/sagemath/conway_polynomials',
- 'conway_polynomials.sobj')
- _conwaydict = None
-
--- a/sage/src/sage/databases/cremona.py
+++ b/sage/src/sage/databases/cremona.py
@@ -54,12 +54,13 @@
@@ -60,43 +47,9 @@ Forwarded: TODO
False
"""
global _db
---- a/sage/src/sage/schemes/elliptic_curves/ec_database.py
-+++ b/sage/src/sage/schemes/elliptic_curves/ec_database.py
-@@ -117,8 +117,7 @@
- ((1, -1, 0, -106384, 13075804), 249649566346838)
-
- """
-- from sage.env import SAGE_SHARE
-- db = os.path.join(SAGE_SHARE,'ellcurves')
-+ db = '/usr/share/sagemath/ellcurves'
- data = os.path.join(db,'rank%s'%rank)
- if not os.path.exists(data):
- return []
---- a/sage/src/sage/graphs/isgci.py
-+++ b/sage/src/sage/graphs/isgci.py
-@@ -376,7 +376,8 @@
- from sage.structure.sage_object import SageObject
- from sage.structure.unique_representation import CachedRepresentation, UniqueRepresentation
- from sage.misc.unknown import Unknown
--from sage.env import SAGE_SHARE
-+
-+SAGE_SHARE = '/usr/share/sagemath/'
-
- #*****************************************************************************
- # Copyright (C) 2011 Nathann Cohen <nathann.cohen at gmail.com>
-@@ -835,8 +836,7 @@
-
- EXAMPLE::
-
-- sage: from sage.env import SAGE_SHARE
-- sage: graph_classes._parse_db(os.path.join(SAGE_SHARE,'graphs'))
-+ sage: graph_classes._parse_db('/usr/share/sagemath/graphs')
- """
- import xml.etree.cElementTree as ET
- import os.path
--- a/sage/src/sage/graphs/strongly_regular_db.pyx
+++ b/sage/src/sage/graphs/strongly_regular_db.pyx
-@@ -3120,8 +3120,7 @@
+@@ -3163,8 +3163,7 @@
return
import json
@@ -106,66 +59,3 @@ Forwarded: TODO
_brouwer_database = {(v,k,l,mu):{'status':status,'comments':comments}
for (v,k,l,mu,status,comments) in json.load(datafile)}
---- a/sage/src/sage/geometry/lattice_polytope.py
-+++ b/sage/src/sage/geometry/lattice_polytope.py
-@@ -112,7 +112,6 @@
- from sage.matrix.constructor import matrix
- from sage.matrix.matrix import is_Matrix
- from sage.misc.all import cached_method, tmp_filename
--from sage.env import SAGE_SHARE
- from sage.modules.all import vector, span
- from sage.misc.superseded import deprecated_function_alias, deprecation
- from sage.plot.plot3d.index_face_set import IndexFaceSet
-@@ -136,7 +135,7 @@
- from functools import reduce
-
-
--data_location = os.path.join(SAGE_SHARE,'reflexive_polytopes')
-+data_location = '/usr/share/sagemath/reflexive_polytopes'
-
-
- class SetOfAllLatticePolytopesClass(Set_generic):
---- a/sage/src/sage/geometry/polyhedron/palp_database.py
-+++ b/sage/src/sage/geometry/polyhedron/palp_database.py
-@@ -107,8 +107,7 @@
- self._data_basename = data_basename
- else:
- import os
-- from sage.env import SAGE_SHARE
-- self._data_basename = os.path.join(SAGE_SHARE, 'reflexive_polytopes',
-+ self._data_basename = os.path.join('/usr/share/sagemath/reflexive_polytopes',
- 'Full'+str(dim)+'d', 'zzdb')
- info = self._data_basename + '.info'
- if not os.path.exists(info):
---- a/sage/src/sage/databases/sql_db.py
-+++ b/sage/src/sage/databases/sql_db.py
-@@ -242,7 +242,6 @@
- skeleton = {}
- cur = database.__connection__.cursor()
- exe = cur.execute("SELECT name FROM sqlite_master WHERE TYPE='table'")
-- from sage.env import SAGE_SHARE
- for table in exe.fetchall():
- skeleton[table[0]] = {}
- exe1 = cur.execute("PRAGMA table_info(%s)"%table[0])
-@@ -257,7 +256,7 @@
- for col in exe2.fetchall():
- if col[1].find('sqlite') == -1:
- if database.__dblocation__ == \
-- os.path.join(SAGE_SHARE,'graphs','graphs.db'):
-+ os.path.join('/usr/share/sagemath/graphs','graphs.db'):
- name = col[1]
- else:
- name = col[1][len(table[0])+3:]
---- a/sage/src/sage/graphs/graph_database.py
-+++ b/sage/src/sage/graphs/graph_database.py
-@@ -54,9 +54,8 @@
- from sage.rings.integer import Integer
- from sqlite3 import dbapi2 as sqlite # if anyone would like to explain why dbapi2...
- from sage.databases.sql_db import SQLDatabase, SQLQuery
--from sage.env import SAGE_SHARE
- from sage.graphs.graph import Graph
--dblocation = os.path.join(SAGE_SHARE,'graphs','graphs.db')
-+dblocation = os.path.join('/usr/share/sagemath/graphs','graphs.db')
-
- def degseq_to_data(degree_sequence):
- """
diff --git a/debian/patches/d0-paths.patch b/debian/patches/d0-paths.patch
index 9d33f30..0f29054 100644
--- a/debian/patches/d0-paths.patch
+++ b/debian/patches/d0-paths.patch
@@ -4,17 +4,6 @@ Author: Ximin Luo <infinity0 at debian.org>
Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/src/sage/ext/pselect.pyx
-+++ b/sage/src/sage/ext/pselect.pyx
-@@ -290,7 +290,7 @@
- writing, but not reading (since nothing has been written)::
-
- sage: f = open(os.devnull, "r")
-- sage: g = open(os.path.join(SAGE_LOCAL, 'bin', 'python'), "r")
-+ sage: g = open('/usr/bin/python2.7', "r")
- sage: (pr, pw) = os.pipe()
- sage: r, w, x, t = PSelecter().pselect([f,g,pr,pw], [pw], [pr,pw])
- sage: len(r), len(w), len(x), t
--- a/sage/src/sage/interfaces/gap.py
+++ b/sage/src/sage/interfaces/gap.py
@@ -194,7 +194,7 @@
@@ -26,20 +15,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
first_try = True
---- a/sage/src/sage/libs/gap/util.pyx
-+++ b/sage/src/sage/libs/gap/util.pyx
-@@ -157,7 +157,7 @@
- '/home/vbraun/opt/sage-5.3.rc0/local/gap/latest'
- """
- import os.path
-- gapdir = os.path.join(SAGE_LOCAL, 'gap', 'latest')
-+ gapdir = '/usr/share/gap'
- if os.path.exists(gapdir):
- return gapdir
- print('The gap-4.5.5.spkg (or later) seems to be not installed!')
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -415,7 +415,7 @@
+@@ -414,7 +414,7 @@
file_list = []
for fname in additional_source_files:
fname = fname.replace("$SAGE_SRC", SAGE_SRC)
diff --git a/debian/patches/d0-singular.patch b/debian/patches/d0-singular.patch
index bc8bc32..4a8257e 100644
--- a/debian/patches/d0-singular.patch
+++ b/debian/patches/d0-singular.patch
@@ -6,46 +6,22 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/interfaces/singular.py
+++ b/sage/src/sage/interfaces/singular.py
-@@ -2283,7 +2283,7 @@
+@@ -2291,7 +2291,7 @@
nodes.clear()
node_names.clear()
-- singular_docdir = SAGE_LOCAL+"/share/singular/"
+- singular_docdir = SAGE_LOCAL+"/share/info/"
+ singular_docdir = "/usr/share/doc/singular-doc/"
new_node = re.compile("File: singular\.hlp, Node: ([^,]*),.*")
new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
---- a/sage/src/sage/libs/singular/singular.pyx
-+++ b/sage/src/sage/libs/singular/singular.pyx
-@@ -24,6 +24,7 @@
- long INT_MIN
-
- import os
-+import sysconfig
-
- from libc.stdint cimport int64_t
- from sage.libs.singular.decl cimport *
-@@ -772,7 +773,7 @@
- extension = "so"
-
- # library name changed from libsingular to libSingular btw 3.x and 4.x
-- lib = SAGE_LOCAL+"/lib/libSingular."+extension
-+ lib = "/usr/lib/%s/libsingular-Singular.so" % sysconfig.get_config_var('MULTIARCH')
-
- if not os.path.exists(lib):
- raise ImportError("cannot locate Singular library ({})".format(lib))
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -309,10 +309,10 @@
- Before :trac:`12975`, it would have been needed to write ``#clang c++``,
- but upper case ``C++`` has resulted in an error::
+@@ -311,7 +311,7 @@
-- sage: code = [
-+ sage: import sysconfig; code = [
+ sage: code = [
....: "#clang C++",
-- ....: "#cinclude %s/include/singular %s/include/factory"%(SAGE_LOCAL, SAGE_LOCAL),
- ....: "#clib m readline Singular givaro ntl gmpxx gmp",
-+ ....: "#cinclude /usr/include/singular /usr/include/singular/singular /usr/include/{0}/singular /usr/include/{0}/singular/singular".format(sysconfig.get_config_var('MULTIARCH')),
+ ....: "#clib m readline singular-Singular givaro ntl gmpxx gmp",
....: "from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomial_libsingular",
....: "from sage.libs.singular.polynomial cimport singular_polynomial_pow",
diff --git a/debian/patches/d1-install-paths.patch b/debian/patches/d1-install-paths.patch
index abb4de2..df059e8 100644
--- a/debian/patches/d1-install-paths.patch
+++ b/debian/patches/d1-install-paths.patch
@@ -23,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
from sage.misc.sageinspect import loadable_module_extension
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -178,9 +178,9 @@
+@@ -174,9 +174,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.]
@@ -36,7 +36,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
import pkgconfig
-@@ -206,7 +206,7 @@
+@@ -202,7 +202,7 @@
m.extra_compile_args = m.extra_compile_args + extra_compile_args
m.extra_link_args = m.extra_link_args + extra_link_args
@@ -45,15 +45,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
m.include_dirs = m.include_dirs + libgap_include_dirs + include_dirs
-@@ -648,7 +648,7 @@
- print('Cleaning up stale installed files....')
- t = time.time()
- from sage_setup.clean import clean_install_dir
--output_dirs = SITE_PACKAGES + glob.glob(os.path.join(build_base, 'lib*'))
-+output_dirs = [SAGE_LIB] + glob.glob(os.path.join(build_base, 'lib*'))
- for output_dir in output_dirs:
- print('- cleaning {0}'.format(output_dir))
- clean_install_dir(output_dir, python_packages, python_modules,
--- a/sage/sage
+++ b/sage/sage
@@ -22,6 +22,7 @@
@@ -78,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'))
-@@ -194,8 +194,8 @@
+@@ -212,8 +212,8 @@
['.../include',
'.../include/python...',
'.../python.../numpy/core/include',
@@ -91,7 +82,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
import distutils.sysconfig
--- a/sage/configure.ac
+++ b/sage/configure.ac
-@@ -1004,8 +1004,7 @@
+@@ -1006,8 +1006,7 @@
AC_MSG_ERROR([[Cannot perform incremental update, run "make distclean && make"]])
fi
else
@@ -148,7 +139,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
-@@ -150,19 +150,18 @@
+@@ -147,19 +147,18 @@
EXAMPLES::
diff --git a/debian/patches/d1-sage-cli.patch b/debian/patches/d1-sage-cli.patch
index a88e171..fd91cd4 100644
--- a/debian/patches/d1-sage-cli.patch
+++ b/debian/patches/d1-sage-cli.patch
@@ -47,16 +47,16 @@ Forwarded: not-needed
echo
#### 1.......................26..................................................78
-@@ -78,8 +68,6 @@
- echo " 'default', 'sagenb', and 'jupyter'). See the output"
- echo " of sage --notebook --help for more details and"
- echo " examples of how to pass optional arguments"
+@@ -79,8 +69,6 @@
+ echo " See the output of sage --notebook --help"
+ echo " for more details and examples of how to pass"
+ echo " optional arguments"
- echo " -bn, -build-and-notebook [...] -- build the Sage library then start"
- echo " the Sage notebook"
echo " -inotebook [...] -- start the *insecure* Sage notebook (deprecated)"
echo " -n, -notebook [...] -- start the default Sage notebook (options are the"
echo " same as for the notebook command in Sage). See the"
-@@ -93,7 +81,6 @@
+@@ -94,7 +82,6 @@
echo " -cython [...] -- run Cython with given arguments"
echo " -ecl [...] -- run Common Lisp"
echo " -gap [...] -- run Sage's Gap with given arguments"
@@ -64,7 +64,7 @@ Forwarded: not-needed
echo " -gdb -- run Sage under the control of gdb"
echo " -gp [...] -- run Sage's PARI/GP calculator with given arguments"
echo " -ipython [...] -- run Sage's IPython using the default environment (not"
-@@ -112,7 +99,6 @@
+@@ -113,7 +100,6 @@
echo " (not installed currently, run sage -i polymake)"
echo " -python [...] -- run the Python interpreter"
echo " -R [...] -- run Sage's R with given arguments"
@@ -72,7 +72,7 @@ Forwarded: not-needed
echo " -sh [...] -- run \$SHELL ($SHELL) with Sage environment variables"
echo " -singular [...] -- run Sage's singular with given arguments"
echo " -sqlite3 [...] -- run Sage's sqlite3 with given arguments"
-@@ -121,49 +107,7 @@
+@@ -122,55 +108,7 @@
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@@ -89,6 +89,12 @@ Forwarded: not-needed
- echo " if they are already installed"
- echo " -s -- do not delete the temporary build directories"
- echo " after a successful build"
+- echo " -y -- reply yes to prompts about experimental"
+- echo " and old-style packages; warning: there"
+- echo " is no guarantee that these packages will"
+- echo " build correctly; use at your own risk"
+- echo " -n -- reply no to prompts about experimental"
+- echo " and old-style packages"
- echo " -p [opts] [packages]-- install the given Sage packages, without dependency"
- echo " checking and with support for old-style spkgs."
- echo " Options are -c, -d and -s with the same meaning as"
@@ -123,7 +129,7 @@ Forwarded: not-needed
echo " -startuptime [module] -- display how long each component of Sage takes to"
echo " start up; optionally specify a module to get more"
echo " details about that particular module"
-@@ -172,9 +116,7 @@
+@@ -179,9 +117,7 @@
echo " selected options:"
echo " --long - include lines with the phrase 'long time'"
echo " --verbose - print debugging output during the test"
@@ -133,7 +139,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"
-@@ -190,9 +132,6 @@
+@@ -197,9 +133,6 @@
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
echo "Documentation:"
@@ -143,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"
-@@ -213,16 +152,6 @@
+@@ -220,16 +153,6 @@
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@@ -160,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"
-@@ -263,74 +192,6 @@
+@@ -270,74 +193,6 @@
exit $status
fi
@@ -235,7 +241,7 @@ Forwarded: not-needed
#####################################################################
# 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
-@@ -355,47 +216,13 @@
+@@ -362,47 +217,13 @@
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
@@ -285,7 +291,7 @@ Forwarded: not-needed
# Start an interactive Sage session, this function never returns.
interactive_sage() {
sage_setup
-@@ -455,11 +282,6 @@
+@@ -462,11 +283,6 @@
exec gap "$@"
fi
@@ -297,7 +303,7 @@ Forwarded: not-needed
if [ "$1" = '-gp' -o "$1" = '--gp' ]; then
shift
exec gp "$@"
-@@ -505,11 +327,6 @@
+@@ -512,11 +328,6 @@
exec kash "$@"
fi
@@ -309,7 +315,7 @@ Forwarded: not-needed
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima-sage "$@"
-@@ -525,21 +342,6 @@
+@@ -532,21 +343,6 @@
exec M2 "$@"
fi
@@ -331,7 +337,7 @@ Forwarded: not-needed
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
exec python "$@"
-@@ -560,11 +362,6 @@
+@@ -567,11 +363,6 @@
exec git "$@"
fi
@@ -343,7 +349,7 @@ Forwarded: not-needed
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
# AUTHORS:
# - Carl Witty and William Stein: initial version
-@@ -684,20 +481,6 @@
+@@ -691,20 +482,6 @@
fi
#####################################################################
@@ -364,7 +370,7 @@ Forwarded: not-needed
# File conversion
#####################################################################
-@@ -715,11 +498,6 @@
+@@ -722,11 +499,6 @@
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@@ -376,7 +382,7 @@ Forwarded: not-needed
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
sage-cleaner &>/dev/null &
exec sage-notebook "$@"
-@@ -730,13 +508,6 @@
+@@ -737,13 +509,6 @@
exec sage-notebook "$@"
fi
@@ -390,7 +396,7 @@ Forwarded: not-needed
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
-@@ -755,38 +526,19 @@
+@@ -762,38 +527,19 @@
exit 0
fi
@@ -431,7 +437,7 @@ Forwarded: not-needed
shift
exec sage-runtests -p "$@"
else
-@@ -795,16 +547,6 @@
+@@ -802,16 +548,6 @@
fi
fi
@@ -448,7 +454,7 @@ Forwarded: not-needed
if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
shift
SAGE_BANNER=no sage_setup
-@@ -819,114 +561,6 @@
+@@ -826,114 +562,6 @@
exec sage-eval "$@"
fi
@@ -563,7 +569,7 @@ Forwarded: not-needed
if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
shift
exec python -m "sage_setup.docbuild" "$@"
-@@ -996,10 +630,6 @@
+@@ -1005,10 +633,6 @@
fi
if [ $# -ge 1 ]; then
diff --git a/debian/patches/d1-sage-env.patch b/debian/patches/d1-sage-env.patch
index b63e0ca..89dbcdd 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
-@@ -197,7 +197,12 @@
+@@ -198,7 +198,12 @@
# append -env to that). We redirect stdout to stderr, which is safer
# for scripts.
#####################################################################
@@ -36,8 +36,8 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
-export SAGE_DOC="$SAGE_SHARE/doc/sage"
+export SAGE_DOC="$SAGE_SHARE/doc/sagemath"
- if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
- SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
+ if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
+ SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
@@ -325,12 +325,12 @@
fi
@@ -86,7 +86,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
# Use a matplotlib config directory specific to Sage and specific to
# the version number of matplotlib, by setting the environment
@@ -468,7 +460,6 @@
- fi
+ fi
fi
fi
-export MAXIMA_PREFIX="$SAGE_LOCAL"
@@ -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
-@@ -221,7 +221,7 @@
+@@ -229,7 +229,7 @@
cd "$(SAGE_SRC)/doc" && $(MAKE) clean
doc-output-clean:
@@ -202,7 +202,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
--- a/sage/src/sage/structure/sage_object.pyx
+++ b/sage/src/sage/structure/sage_object.pyx
-@@ -1478,7 +1478,7 @@
+@@ -1519,7 +1519,7 @@
When run with no arguments :meth:`unpickle_all` tests that all of the
"standard" pickles stored in the pickle_jar at
@@ -213,7 +213,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
-@@ -383,7 +383,7 @@
+@@ -403,7 +403,7 @@
document_name = document.split('/')[1]
# the sage directory within a subdocument, for example
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 9c81588..f0ac175 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
-@@ -756,16 +756,6 @@
+@@ -754,16 +754,6 @@
4
sage: v[Integer(2):Integer(4)]
[3, 4]
diff --git a/debian/patches/dt-disable-parallel-sphinx.patch b/debian/patches/dt-disable-parallel-sphinx.patch
index 332b19e..a99d906 100644
--- a/debian/patches/dt-disable-parallel-sphinx.patch
+++ b/debian/patches/dt-disable-parallel-sphinx.patch
@@ -9,68 +9,12 @@ Forwarded: not-needed
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
-@@ -288,20 +288,21 @@
- getattr(get_builder(document), name)(*args, **kwds)
+@@ -241,7 +241,7 @@
+ inventory = builder_helper('inventory')
- # build the other documents in parallel
-- from multiprocessing import Pool
-- pool = Pool(NUM_THREADS, maxtasksperchild=1)
-+ #from multiprocessing import Pool
-+ #pool = Pool(NUM_THREADS, maxtasksperchild=1)
- L = [(doc, name, kwds) + args for doc in others]
- # map_async handles KeyboardInterrupt correctly. Plain map and
- # apply_async does not, so don't use it.
-- x = pool.map_async(build_other_doc, L, 1)
-- try:
-- x.get(99999)
-- pool.close()
-- pool.join()
-- except Exception:
-- pool.terminate()
-- if ABORT_ON_ERROR:
-- raise
-+ #x = pool.map_async(build_other_doc, L, 1)
-+ map(build_other_doc, L)
-+ #try:
-+ # x.get(99999)
-+ # pool.close()
-+ # pool.join()
-+ #except Exception:
-+ # pool.terminate()
-+ # if ABORT_ON_ERROR:
-+ # raise
- logger.warning("Elapsed time: %.1f seconds."%(time.time()-start))
- logger.warning("Done building the documentation!")
-@@ -486,19 +487,20 @@
- if not os.path.exists(refdir):
- continue
- output_dir = self._output_dir(format, lang)
-- from multiprocessing import Pool
-- pool = Pool(NUM_THREADS, maxtasksperchild=1)
-+ #from multiprocessing import Pool
-+ #pool = Pool(NUM_THREADS, maxtasksperchild=1)
- L = [(doc, lang, format, kwds) + args for doc in self.get_all_documents(refdir)]
- # (See comment in AllBuilder._wrapper about using map instead of apply.)
-- x = pool.map_async(build_ref_doc, L, 1)
-- try:
-- x.get(99999)
-- pool.close()
-- pool.join()
-- except Exception:
-- pool.terminate()
-- if ABORT_ON_ERROR:
-- raise
-+ #x = pool.map_async(build_ref_doc, L, 1)
-+ map(build_ref_doc, L)
-+ #try:
-+ # x.get(99999)
-+ # pool.close()
-+ # pool.join()
-+ #except Exception:
-+ # pool.terminate()
-+ # if ABORT_ON_ERROR:
-+ # raise
- # The html refman must be build at the end to ensure correct
- # merging of indexes and inventories.
- # Sphinx is run here in the current process (not in a
+-if NUM_THREADS > 1:
++if False:
+ def build_many(target, args):
+ from multiprocessing import Pool
+ pool = Pool(NUM_THREADS, maxtasksperchild=1)
diff --git a/debian/patches/dt-more-fix-test-cases.patch b/debian/patches/dt-more-fix-test-cases.patch
index 7f0ae0d..72acc1a 100644
--- a/debian/patches/dt-more-fix-test-cases.patch
+++ b/debian/patches/dt-more-fix-test-cases.patch
@@ -13,45 +13,6 @@ src/sage/interfaces/tests.py
They are bugs in the dependency tools that Sage upstream patches out on their
side. Hopefully they have forwarded these on, so at some point they will be
fixed also in Debian. For now, we override to reduce the noise in our tests.
---- a/sage/src/sage/symbolic/expression.pyx
-+++ b/sage/src/sage/symbolic/expression.pyx
-@@ -7612,9 +7612,7 @@
- sage: maxima('atan2(0,0.6)')
- 0.0
- sage: SR(0).arctan2(0) # see trac ticket #11423
-- Traceback (most recent call last):
-- ...
-- RuntimeError: arctan2_eval(): arctan2(0,0) encountered
-+ NaN
- sage: SR(I).arctan2(1)
- arctan2(I, 1)
- sage: SR(CDF(0,1)).arctan2(1)
---- a/sage/src/sage/symbolic/expression_conversions.py
-+++ b/sage/src/sage/symbolic/expression_conversions.py
-@@ -1894,9 +1894,7 @@
- arctan2(0, 0) + 1
- sage: h = HoldRemover(ex, [hypergeometric])
- sage: h()
-- Traceback (most recent call last):
-- ...
-- RuntimeError: arctan2_eval(): arctan2(0,0) encountered
-+ NaN + hypergeometric((1, 2), (3, 4), 0)
- """
- self.ex = ex
- if exclude is None:
---- a/sage/src/sage/functions/trig.py
-+++ b/sage/src/sage/functions/trig.py
-@@ -888,9 +888,7 @@
- Check if atan2(0,0) throws error of :trac:`11423`::
-
- sage: atan2(0,0)
-- Traceback (most recent call last):
-- ...
-- RuntimeError: arctan2_eval(): arctan2(0,0) encountered
-+ NaN
-
- sage: atan2(0,0,hold=True)
- arctan2(0, 0)
--- a/sage/src/sage/interfaces/tests.py
+++ b/sage/src/sage/interfaces/tests.py
@@ -32,9 +32,9 @@
diff --git a/debian/patches/dt-version-singular-4-extra-fixes.patch b/debian/patches/dt-version-singular-4-extra-fixes.patch
index e1f135e..77d8d8f 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
-@@ -299,7 +299,7 @@
+@@ -300,7 +300,7 @@
if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
shift
--
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