[sagemath] 02/02: Fix another 3 singular-related tests; takes effect after next Singular upload

[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 0eed64f4d4720dfc7f93b55d6230b690cba9a9da
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Oct 13 13:54:33 2016 +0200

    Fix another 3 singular-related tests; takes effect after next Singular upload
---
 debian/README.Debian                             | 11 ++++---
 debian/patches/debian-singular.patch             |  2 +-
 debian/patches/debian-temp-no-singular-hlp.patch | 39 ------------------------
 debian/patches/series                            |  1 -
 4 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index aecb5ee..a20b40a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -63,6 +63,10 @@ AppliedUndef" and remove the whole of "def _sage_" from it, this will fix
 another 2 tests. This is also already fixed in sympy (Debian) git, we're just
 waiting for an upload.
 
+Next, run `zcat /usr/share/doc/singular-doc/singular.hlp.gz | sudo tee /usr/share/doc/singular-doc/singular.hlp >/dev/null`
+which will fix another 3 tests. This is also already fixed in singular (Debian)
+git, we're just waiting for an upload.
+
 You can see infinity0's test failures here: https://people.debian.org/~infinity0/res/
 Look for files named "sagemath-*_*.log"
 
@@ -70,8 +74,8 @@ Now for the summary:
 
 ### Breakdown
 
-36+5 unreproducible for infinity0
-49 (estimated) for Tobias
+33+5 unreproducible for infinity0
+46 (estimated) for Tobias
 
 ### We have some sort of lead for further investigation
 
@@ -112,12 +116,11 @@ sage -t --long src/sage/tensor/differential_form_element.py  # 2 doctests failed
 sage -t --long src/sage/symbolic/expression.pyx  # 1 doctest failed
 # ^ plus one extra for Tobias
 
-11 Others
+8 Others
 sage -t --long src/sage/coding/code_bounds.py  # 1 doctest failed
 sage -t --long src/sage/crypto/block_cipher/miniaes.py  # 1 doctest failed
 sage -t --long src/sage/functions/exp_integral.py  # 1 doctest failed
 sage -t --long src/sage/functions/log.py  # 2 doctests failed
-sage -t --long src/sage/interfaces/singular.py  # 3 doctests failed
 sage -t --long src/sage/libs/singular/function.pyx  # 2 doctests failed (see #17254#comment:252)
 sage -t --long src/sage/numerical/mip.pyx  # 1 doctest failed
 
diff --git a/debian/patches/debian-singular.patch b/debian/patches/debian-singular.patch
index 1274b92..3328d45 100644
--- a/debian/patches/debian-singular.patch
+++ b/debian/patches/debian-singular.patch
@@ -22,7 +22,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      node_names.clear()
  
 -    singular_docdir = os.environ["SAGE_LOCAL"]+"/share/singular/"
-+    singular_docdir = "/usr/share/singular/"
++    singular_docdir = "/usr/share/doc/singular-doc/"
  
      new_node = re.compile("File: singular\.hlp,  Node: ([^,]*),.*")
      new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
diff --git a/debian/patches/debian-temp-no-singular-hlp.patch b/debian/patches/debian-temp-no-singular-hlp.patch
deleted file mode 100644
index 121314b..0000000
--- a/debian/patches/debian-temp-no-singular-hlp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Don't try to use singular.hlp
- That file is currently in .gz form but this is fixed in (Debian's) git.
- So we can remove this patch after the next Singular (Debian) upload.
-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/interfaces/singular.py
-+++ b/sage/src/sage/interfaces/singular.py
-@@ -1253,9 +1253,9 @@
-         self._start()
-         raise KeyboardInterrupt("Restarting %s (WARNING: all variables defined in previous session are now invalid)" % self)
- 
--    
-+
- class SingularElement(ExtraTabCompletion, ExpectElement):
--    
-+
-     def __init__(self, parent, type, value, is_name=False):
-         """
-         EXAMPLES::
-@@ -2279,7 +2279,7 @@
- 
-     L, in_node, curr_node = [], False, None
- 
--    for line in open(singular_docdir + "singular.hlp"):
-+    '''for line in open(singular_docdir + "singular.hlp"):
-         m = re.match(new_node,line)
-         if m:
-             # a new node starts
-@@ -2298,7 +2298,7 @@
-         if line == "6 Index\n":
-             in_node = False
- 
--    nodes[curr_node] = "".join(L) # last node
-+    nodes[curr_node] = "".join(L) # last node'''
- 
- def get_docstring(name):
-     """
diff --git a/debian/patches/series b/debian/patches/series
index 774b75c..7073683 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,4 +46,3 @@ debian-temp-userdir.patch
 temp-disable-parallel-sphinx.patch
 temp-cython-include-source.patch
 version-temp-singular-4-extra-fixes.patch
-debian-temp-no-singular-hlp.patch

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