[sagemath] 04/06: Update patches (part 2).
Tobias Hansen
thansen at moszumanska.debian.org
Thu Jan 19 00:32:06 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 90a9ada6ab8a18f501f1f9d5c69dfd143a3a255a
Author: Tobias Hansen <thansen at debian.org>
Date: Thu Jan 19 00:03:48 2017 +0000
Update patches (part 2).
---
debian/changelog | 2 +
debian/patches/d0-arb.patch | 8 ++--
debian/patches/d0-cython-sys-path.patch | 16 +++----
debian/patches/d0-gsl-cblas.patch | 6 +--
debian/patches/d0-libgap-sage.patch | 16 +++----
debian/patches/d0-maxima.patch | 2 +-
debian/patches/d0-nauty.patch | 2 +-
.../patches/u2-fix-less-trivial-test-cases.patch | 25 ++--------
debian/patches/u2-fix-trivial-test-cases.patch | 54 +---------------------
debian/patches/u2-scripts-dir.patch | 30 ++++++------
10 files changed, 48 insertions(+), 113 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 081a71e..1c88358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ sagemath (7.5.1-1) UNRELEASED; urgency=medium
- u0-pip-nowarn.patch
- u0-version-pari-2.9.patch
- u2-allow-override-sage-local.patch
+ - u2-fix-trivial-test-cases.patch
+ - u2-fix-less-trivial-test-cases.patch
-- Tobias Hansen <thansen at debian.org> Wed, 18 Jan 2017 22:58:31 +0000
diff --git a/debian/patches/d0-arb.patch b/debian/patches/d0-arb.patch
index fa46242..7c64435 100644
--- a/debian/patches/d0-arb.patch
+++ b/debian/patches/d0-arb.patch
@@ -6,24 +6,24 @@ Forwarded: not-needed
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
-@@ -131,7 +131,7 @@
+@@ -133,7 +133,7 @@
"ec", "ecm",
- ] + linbox_libs + gsl_libs + [
+ ] + linbox_libs + fflas_ffpack_libs + gsl_libs + [
"pari", "flint", "ratpoints", "ecl", "glpk", "ppl",
- "arb", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
+ "flint-arb", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
"brial",
"brial_groebner",
"m4rie",
-@@ -856,7 +856,7 @@
+@@ -824,7 +824,7 @@
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
- libraries=['arb', 'mpfi', 'mpfr'],
+ libraries=['flint-arb', 'mpfi', 'mpfr'],
- include_dirs=[SAGE_INC + '/flint'],
language = "c++"),
+ Extension('sage.matrix.matrix_complex_double_dense',
--- a/sage/src/sage/libs/arb/acb.pxd
+++ b/sage/src/sage/libs/arb/acb.pxd
@@ -1,4 +1,4 @@
diff --git a/debian/patches/d0-cython-sys-path.patch b/debian/patches/d0-cython-sys-path.patch
index 9848a57..419e44c 100644
--- a/debian/patches/d0-cython-sys-path.patch
+++ b/debian/patches/d0-cython-sys-path.patch
@@ -5,14 +5,14 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -598,6 +598,7 @@
- build_dir=SAGE_CYTHONIZED,
- force=force,
- aliases=aliases,
-+ include_path=sys.path,
- compiler_directives={
- 'autotestdict': False,
- 'cdivision': True,
+@@ -402,6 +402,7 @@
+ build_dir=SAGE_CYTHONIZED,
+ force=force,
+ aliases=aliases,
++ include_path=sys.path,
+ compiler_directives={
+ 'autotestdict': False,
+ 'cdivision': True,
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
@@ -245,6 +245,7 @@
diff --git a/debian/patches/d0-gsl-cblas.patch b/debian/patches/d0-gsl-cblas.patch
index e4ff732..5540a2b 100644
--- a/debian/patches/d0-gsl-cblas.patch
+++ b/debian/patches/d0-gsl-cblas.patch
@@ -12,9 +12,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# CBLAS can be one of multiple implementations
-cblas_pc = pkgconfig.parse('cblas')
--cblas_libs = list(cblas_pc['libraries'])
--cblas_library_dirs = list(cblas_pc['library_dirs'])
--cblas_include_dirs = list(cblas_pc['include_dirs'])
+-cblas_libs = cblas_pc['libraries']
+-cblas_library_dirs = cblas_pc['library_dirs']
+-cblas_include_dirs = cblas_pc['include_dirs']
+cblas_libs = [u'gslcblas', u'm']
+cblas_library_dirs = []
+cblas_include_dirs = []
diff --git a/debian/patches/d0-libgap-sage.patch b/debian/patches/d0-libgap-sage.patch
index be7934c..79a1fa8 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
-@@ -45,6 +45,10 @@
- gsl_library_dirs = list(gsl_pc['library_dirs'])
- gsl_include_dirs = list(gsl_pc['include_dirs'])
+@@ -47,6 +47,10 @@
+ gsl_library_dirs = gsl_pc['library_dirs']
+ gsl_include_dirs = gsl_pc['include_dirs']
+# LibGAP
+libgap_pc = pkgconfig.parse('libgap-sage')
@@ -44,8 +44,8 @@ Forwarded: not-needed
+
# GD image library
gd_pc = pkgconfig.parse('gdlib')
- gd_libs = list(gd_pc['libraries'])
-@@ -135,8 +139,8 @@
+ gd_libs = gd_pc['libraries']
+@@ -137,8 +141,8 @@
"brial_groebner",
"m4rie",
] + m4ri_libs + [
@@ -56,7 +56,7 @@ Forwarded: not-needed
"m", "readline", "Lfunction" ,
] + cblas_libs + [
"cryptominisat",
-@@ -702,15 +706,15 @@
+@@ -670,15 +674,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
-@@ -183,6 +183,12 @@
+@@ -179,6 +179,12 @@
"ntl": [ os.path.join(SAGE_INC, 'NTL', 'config.h') ]
}
@@ -90,7 +90,7 @@ Forwarded: not-needed
# In the loop below, don't append to any list, since many of these
# lists are actually identical Python objects. For every list, we need
# to write (at least the first time):
-@@ -200,8 +206,8 @@
+@@ -196,8 +202,8 @@
m.extra_compile_args = m.extra_compile_args + extra_compile_args
m.extra_link_args = m.extra_link_args + extra_link_args
diff --git a/debian/patches/d0-maxima.patch b/debian/patches/d0-maxima.patch
index 97b93e1..e48be16 100644
--- a/debian/patches/d0-maxima.patch
+++ b/debian/patches/d0-maxima.patch
@@ -84,7 +84,7 @@ Author: Tobias Hansen <thansen at debian.org>
...
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -512,7 +512,7 @@
+@@ -519,7 +519,7 @@
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
diff --git a/debian/patches/d0-nauty.patch b/debian/patches/d0-nauty.patch
index 374263f..ca4000a 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
-@@ -869,10 +869,10 @@
+@@ -871,10 +871,10 @@
sage: gen = graphs.nauty_geng("4", debug=True)
sage: print(next(gen))
diff --git a/debian/patches/u2-fix-less-trivial-test-cases.patch b/debian/patches/u2-fix-less-trivial-test-cases.patch
index e8b729a..1f48301 100644
--- a/debian/patches/u2-fix-less-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-less-trivial-test-cases.patch
@@ -28,7 +28,7 @@ According to Wolfram both answers are slightly wrong so just override with ours
to reduce the noise in our test results.
--- a/sage/src/sage/functions/exp_integral.py
+++ b/sage/src/sage/functions/exp_integral.py
-@@ -1169,7 +1169,7 @@
+@@ -1170,7 +1170,7 @@
sage: f(x) = cosh_integral(x)
sage: find_root(f, 0.1, 1.0)
@@ -37,28 +37,9 @@ to reduce the noise in our test results.
Compare ``cosh_integral(3.0)`` to the definition of the value using
numerical integration::
---- a/sage/src/sage/graphs/strongly_regular_db.pyx
-+++ b/sage/src/sage/graphs/strongly_regular_db.pyx
-@@ -3135,12 +3135,12 @@
-
- sage: from sage.graphs.strongly_regular_db import _check_database
- sage: _check_database() # long time
-- Sage cannot build a (196 60 14 20 ) that exists. Comment from Brouwer's database: pg(6,9,2)?
-+ Sage cannot build a (196 60 14 20 ) that exists. Comment from Brouwer's database:... pg(6,9,2)?
- ...
- In Andries Brouwer's database:
-- - 452 impossible entries
-- - 2936 undecided entries
-- - 1150 realizable entries (Sage misses ... of them)
-+ - 4... impossible entries
-+ - 29... undecided entries
-+ - 11... realizable entries (Sage misses ... of them)
-
- """
- global _brouwer_database
--- a/sage/src/sage/rings/integer.pyx
+++ b/sage/src/sage/rings/integer.pyx
-@@ -6072,8 +6072,7 @@
+@@ -6070,8 +6070,7 @@
sage: 1 << (2^60)
Traceback (most recent call last):
...
@@ -88,7 +69,7 @@ to reduce the noise in our test results.
"""
from sage.symbolic.expression import Expression
from sage.ext.fast_eval import fast_callable
-@@ -527,7 +527,7 @@
+@@ -519,7 +519,7 @@
GLPK Simplex Optimizer...
OPTIMAL LP SOLUTION FOUND
sage: sol['x']
diff --git a/debian/patches/u2-fix-trivial-test-cases.patch b/debian/patches/u2-fix-trivial-test-cases.patch
index 2dd9219..56d558a 100644
--- a/debian/patches/u2-fix-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-trivial-test-cases.patch
@@ -30,7 +30,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
high precision very quickly::
--- a/sage/src/sage/calculus/calculus.py
+++ b/sage/src/sage/calculus/calculus.py
-@@ -723,7 +723,7 @@
+@@ -770,7 +770,7 @@
Now numerically integrating, we see why the answer is wrong::
sage: f.nintegrate(x,0,1)
@@ -41,7 +41,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
in floating point.
--- a/sage/src/sage/modules/free_module_element.pyx
+++ b/sage/src/sage/modules/free_module_element.pyx
-@@ -3886,11 +3886,11 @@
+@@ -3882,11 +3882,11 @@
sage: type(vec)
<type 'sage.modules.vector_real_double_dense.Vector_real_double_dense'>
sage: answers
@@ -79,18 +79,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
...
ZeroDivisionError: rational division by zero
sage: rc is None
-@@ -587,10 +587,7 @@
- sage: shell = interface_shell_embed(gap)
- sage: shell.run_cell('List( [1..10], IsPrime )')
- [ false, true, true, false, true, false, true, false, false, false ]
-- <repr(<IPython.core.interactiveshell.ExecutionResult at 0x...>) failed:
-- AttributeError: type object 'ExecutionResult' has no attribute '__qualname__'>
--
-- Note that the repr error is https://github.com/ipython/ipython/issues/9756
-+ <ExecutionResult object at ... result=[ false, true, true, false, true, false, true, false, false, false ]>
- """
- cfg = sage_ipython_config.copy()
- ipshell = InteractiveShellEmbed(config=cfg,
--- a/sage/src/sage/interfaces/interface.py
+++ b/sage/src/sage/interfaces/interface.py
@@ -522,9 +522,9 @@
@@ -105,44 +93,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"""
args, kwds = self._convert_args_kwds(args, kwds)
self._check_valid_function_name(function)
---- a/sage/src/sage/combinat/words/word.py
-+++ b/sage/src/sage/combinat/words/word.py
-@@ -511,7 +511,7 @@
- sage: dumps(w)
- Traceback (most recent call last):
- ...
-- PicklingError: Can't pickle <type 'generator'>: attribute lookup __builtin__.generator failed
-+ TypeError: can't pickle generator objects
- """
- pass
-
-@@ -549,7 +549,7 @@
- sage: dumps(w)
- Traceback (most recent call last):
- ...
-- PicklingError: Can't pickle <type 'generator'>: attribute lookup __builtin__.generator failed
-+ TypeError: can't pickle generator objects
- """
- pass
-
-@@ -648,7 +648,7 @@
- sage: dumps(w)
- Traceback (most recent call last):
- ...
-- PicklingError: Can't pickle <type 'generator'>: attribute lookup __builtin__.generator failed
-+ TypeError: can't pickle generator objects
- """
- pass
-
-@@ -684,7 +684,7 @@
- sage: dumps(w)
- Traceback (most recent call last):
- ...
-- PicklingError: Can't pickle <type 'generator'>: attribute lookup __builtin__.generator failed
-+ TypeError: can't pickle generator objects
- """
- pass
-
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
@@ -173,14 +173,15 @@
diff --git a/debian/patches/u2-scripts-dir.patch b/debian/patches/u2-scripts-dir.patch
index a97f570..d3e2f9f 100644
--- a/debian/patches/u2-scripts-dir.patch
+++ b/debian/patches/u2-scripts-dir.patch
@@ -15,23 +15,23 @@ Forwarded: TODO
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -425,13 +425,13 @@
+@@ -432,13 +432,13 @@
#####################################################################
if [ "$1" = '-dumpversion' -o "$1" = '--dumpversion' ]; then
-- . "$SAGE_LOCAL"/bin/sage-version.sh
-+ . "$SAGE_SCRIPTS_DIR"/sage-version.sh
- echo ${SAGE_VERSION}
- exit 0
+- . "$SAGE_LOCAL"/bin/sage-version.sh
++ . "$SAGE_SCRIPTS_DIR"/sage-version.sh
+ echo ${SAGE_VERSION}
+ exit 0
fi
if [ "$1" = '-v' -o "$1" = '-version' -o "$1" = '--version' ]; then
-- . "$SAGE_LOCAL"/bin/sage-version.sh
-+ . "$SAGE_SCRIPTS_DIR"/sage-version.sh
- echo "SageMath version ${SAGE_VERSION}, Release Date: ${SAGE_RELEASE_DATE}"
- exit 0
+- . "$SAGE_LOCAL"/bin/sage-version.sh
++ . "$SAGE_SCRIPTS_DIR"/sage-version.sh
+ echo "SageMath version ${SAGE_VERSION}, Release Date: ${SAGE_RELEASE_DATE}"
+ exit 0
fi
-@@ -936,12 +936,12 @@
+@@ -943,14 +943,14 @@
shift
sage_setup
if [ "$SAGE_DEBUG" = "no" ]; then
@@ -40,7 +40,9 @@ Forwarded: TODO
+ gdb -x "$SAGE_SCRIPTS_DIR/sage-gdb-commands" \
+ -args python "$SAGE_SCRIPTS_DIR/sage-ipython" "$@" -i
else
- cygdb "$SAGE_SRC/build" "$SAGE_SRC/sage" \
+ # Location of cython_debug directory
+ cygdb_dir="$SAGE_SRC/build/cythonized"
+ cygdb "$cygdb_dir" "$SAGE_SRC/sage" \
- -- -x "$SAGE_LOCAL/bin/sage-gdb-commands" \
- -args python "$SAGE_LOCAL/bin/sage-ipython" "$@" -i
+ -- -x "$SAGE_SCRIPTS_DIR/sage-gdb-commands" \
@@ -60,9 +62,9 @@ Forwarded: TODO
}
@@ -275,7 +275,7 @@
- SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
- SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET
- fi
+ SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
+ SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET
+ fi
-export PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
+export PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$SAGE_SCRIPTS_DIR:$PATH"
--
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