[sagemath] 01/01: Add patch for cddlib 094h, fixes 6 tests, still 1 failing

[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 23d90209e5aebd1078e43f19a1dd0e09937a13da
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Oct 13 12:38:02 2016 +0200

    Add patch for cddlib 094h, fixes 6 tests, still 1 failing
---
 debian/README.Debian                     | 10 ++++------
 debian/patches/series                    |  1 +
 debian/patches/version-cddlib-094h.patch | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 2e1cc28..896ce1d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -65,8 +65,8 @@ Now for the summary:
 
 ### Breakdown
 
-45+5 unreproducible for infinity0
-58 (estimated) for Tobias
+39+5 unreproducible for infinity0
+52 (estimated) for Tobias
 
 ### We have some sort of lead for further investigation
 
@@ -80,13 +80,11 @@ sage -t --long src/sage/numerical/backends/glpk_backend.pyx  # 6 doctests failed
 sage -t --long src/sage/numerical/backends/glpk_graph_backend.pyx  # 3 doctests failed
 sage -t --long src/sage/libs/glpk/error.pyx  # 1 doctest failed
 
-7 CDD
-sage -t --long src/sage/geometry/polyhedron/backend_cdd.py  # 7 doctests failed
-
 3 Very-minor floating point differences
 sage -t --long src/sage/numerical/optimize.py  # 4 doctests failed (1 is not floating-point related)
 
-7 Others
+8 Others
+sage -t --long src/sage/geometry/polyhedron/backend_cdd.py  # 1 doctests failed
 sage -t --long src/sage/interfaces/tests.py  # 2 doctests failed
 sage -t --long src/sage/numerical/optimize.py  # 4 doctests failed (3 accounted for above, 1 reported as #840159)
 sage -t --long src/sage/repl/ipython_kernel/install.py  # 1 doctest failed
diff --git a/debian/patches/series b/debian/patches/series
index 5b5023a..f8b61a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,6 +19,7 @@ version-ecm-7.patch
 version-linbox-1.4.patch
 version-ipython-5.patch
 version-singular-4.patch
+version-cddlib-094h.patch
 #version-planarity-3.patch #breaks tests
 
 # due to Debian's inherent differences with upstream;
diff --git a/debian/patches/version-cddlib-094h.patch b/debian/patches/version-cddlib-094h.patch
new file mode 100644
index 0000000..baf73d3
--- /dev/null
+++ b/debian/patches/version-cddlib-094h.patch
@@ -0,0 +1,29 @@
+Description: Use cddlib version 094h
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: TBD
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sage/src/sage/geometry/polyhedron/backend_cdd.py
++++ b/sage/src/sage/geometry/polyhedron/backend_cdd.py
+@@ -288,7 +290,9 @@
+             else:
+                 n_cdd=n;
+             self._V_adjacency_matrix = matrix(ZZ, n, n, 0)
+-            expect_in_cddout('begin')
++            if not find_in_cddout('begin'):
++                raise ValueError('Error while parsing cdd output: could not '
++                                 'find "begin" after "Vertex graph"')
+             l = cddout.pop(0).split()
+             assert int(l[0]) == n_cdd, "Not enough V-adjacencies in cdd output?"
+             for i in range(n_cdd):
+@@ -311,7 +315,9 @@
+         if find_in_cddout('Facet graph'):
+             n = len(self._Hrepresentation);
+             self._H_adjacency_matrix = matrix(ZZ, n, n, 0)
+-            expect_in_cddout('begin')
++            if not find_in_cddout('begin'):
++                raise ValueError('Error while parsing cdd output: could not '
++                                 'find "begin" after "Facet graph"')
+             l = cddout.pop(0).split()
+             assert int(l[0]) == n, "Not enough H-adjacencies in cdd output?"
+             for i in range(n):

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