[sagemath] 01/02: Fix some more singular-4-related tests, but there are 2 left

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagemath.

commit e329e8f61ef5ef2ceef2cae4adbf952e78d5b232
Author: Ximin Luo <infinity0 at debian.org>
Date:   Wed Oct 12 01:33:34 2016 +0200

    Fix some more singular-4-related tests, but there are 2 left
    
    sage -t --long --warn-long 148.4 src/sage/libs/singular/function.pyx  # 2 doctests failed
    
    See also https://trac.sagemath.org/ticket/17254#comment:252
    
    unclear if this is resolved yet or not
---
 debian/patches/debian-singular.patch               | 19 +++++++++++---
 debian/patches/series                              |  4 ++-
 debian/patches/temp-cython-include-source.patch    |  2 +-
 .../version-temp-singular-4-extra-fixes.patch      | 30 ++++++++++++++++++++++
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/debian/patches/debian-singular.patch b/debian/patches/debian-singular.patch
index be7c7eb..12e3eb5 100644
--- a/debian/patches/debian-singular.patch
+++ b/debian/patches/debian-singular.patch
@@ -37,12 +37,25 @@ Description: Additional changes to work with the Debian package of singular
          raise ImportError("cannot locate Singular library ({})".format(lib))
 --- a/sage/src/sage/misc/cython.py
 +++ b/sage/src/sage/misc/cython.py
-@@ -306,7 +306,7 @@
+@@ -306,8 +306,8 @@
  
          sage: code = [
          ... "#clang C++",
 -        ... "#cinclude %s/include/singular %s/include/factory"%(SAGE_LOCAL, SAGE_LOCAL),
-+        ... "#cinclude /usr/include/singular/singular /usr/include/singular/factory",
-         ... "#clib m readline Singular givaro ntl gmpxx gmp",
+-        ... "#clib m readline Singular givaro ntl gmpxx gmp",
++        ... "#cinclude /usr/include/singular /usr/include/singular/singular /usr/include/x86_64-linux-gnu/singular /usr/include/x86_64-linux-gnu/singular/singular",
++        ... "#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",
+         ... "def test(MPolynomial_libsingular p):",
+--- a/sage/src/sage/interfaces/tests.py
++++ b/sage/src/sage/interfaces/tests.py
+@@ -39,7 +39,7 @@
+     0
+     sage: subprocess.call("echo syntax error | ipython", **kwds) in (0,1)
+     True
+-    sage: subprocess.call("echo syntax error | singular", **kwds)
++    sage: subprocess.call("echo syntax error | Singular", **kwds)
+     0
+ """
+ from __future__ import print_function
diff --git a/debian/patches/series b/debian/patches/series
index 28be2ef..c36114c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,6 +37,8 @@ debian-sage-env.patch
 debian-octave.patch
 debian-no-singular-hlp.patch
 debian-sage-gap-reset.patch
+# this next one contains some stuff that should be forwarded upstream
+debian-fix-trivial-test-cases.patch
 
 # temporary patches for whatever reason
 # they will eventually be gotten rid of
@@ -44,4 +46,4 @@ debian-temp-userdir-singular.patch
 debian-temp-userdir.patch
 temp-disable-parallel-sphinx.patch
 temp-cython-include-source.patch
-debian-fix-trivial-test-cases.patch
+version-temp-singular-4-extra-fixes.patch
diff --git a/debian/patches/temp-cython-include-source.patch b/debian/patches/temp-cython-include-source.patch
index 95b91a0..b0ceeaf 100644
--- a/debian/patches/temp-cython-include-source.patch
+++ b/debian/patches/temp-cython-include-source.patch
@@ -4,7 +4,7 @@ Author: Tobias Hansen <thansen at debian.org>
 
 --- a/sage/src/sage/misc/cython.py
 +++ b/sage/src/sage/misc/cython.py
-@@ -230,7 +230,7 @@
+@@ -232,7 +232,7 @@
      additional_source_files, s = parse_keywords('cfile', s)
  
      v, s = parse_keywords('cinclude', s)
diff --git a/debian/patches/version-temp-singular-4-extra-fixes.patch b/debian/patches/version-temp-singular-4-extra-fixes.patch
new file mode 100644
index 0000000..2b61a02
--- /dev/null
+++ b/debian/patches/version-temp-singular-4-extra-fixes.patch
@@ -0,0 +1,30 @@
+Description: Use -b when running Singular CLI
+ Works around upstream Singular bug #775.
+ We should also forward this to Sage upstream.
+Author: Ximin Luo <infinity0 at debian.org>
+Bug: https://www.singular.uni-kl.de:8005/trac/ticket/775
+Forwarded: TBD, to Sage
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sage/src/bin/sage
++++ b/sage/src/bin/sage
+@@ -467,7 +467,7 @@
+ 
+ if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
+     shift
+-    exec Singular "$@"
++    exec Singular -b "$@"
+ fi
+ 
+ if [ "$1" = '-sqlite3' -o "$1" = '--sqlite3' ]; then
+--- a/sage/src/sage/interfaces/tests.py
++++ b/sage/src/sage/interfaces/tests.py
+@@ -39,7 +39,7 @@
+     0
+     sage: subprocess.call("echo syntax error | ipython", **kwds) in (0,1)
+     True
+-    sage: subprocess.call("echo syntax error | Singular", **kwds)
++    sage: subprocess.call("echo syntax error | Singular -b", **kwds)
+     0
+ """
+ from __future__ import print_function

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git