[Python-modules-commits] [python-igraph] 01/01: Fix FTBFS on i386.
Hugo Lefeuvre
hle at moszumanska.debian.org
Wed Aug 24 10:43:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
hle pushed a commit to branch master
in repository python-igraph.
commit 62655487f43dd2e608c473f4577502b62cb35525
Author: Hugo Lefeuvre <hle at debian.org>
Date: Wed Aug 24 11:58:52 2016 +0200
Fix FTBFS on i386.
* Fix FTBFS on i386 (Closes: #806383).
* debian/control:
- Add myself to the uploaders.
- Bump Standards-Version to 3.9.8.
- Update Homepage field.
* debian/copyright:
- Add an entry for Hugo Lefeuvre.
- Update copyright years.
* Bump compatibility to 9 (and dependency on debhelper to (> 9)).
---
debian/changelog | 16 ++-
debian/compat | 2 +-
debian/control | 21 ++--
debian/copyright | 7 +-
debian/patches/fix-test-case-failures.patch | 149 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
6 files changed, 180 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e5abd58..8d4c0cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
-python-igraph (0.7.1.post6-3) UNRELEASED; urgency=medium
+python-igraph (0.7.1.post6-3) unstable; urgency=medium
+ [ Ondřej Nový ]
* Fixed VCS URL (https)
- -- Ondřej Nový <novy at ondrej.org> Tue, 29 Mar 2016 22:08:57 +0200
+ [ Hugo Lefeuvre ]
+ * Fix FTBFS on i386 (Closes: #806383).
+ * debian/control:
+ - Add myself to the uploaders.
+ - Bump Standards-Version to 3.9.8.
+ - Update Homepage field.
+ * debian/copyright:
+ - Add an entry for Hugo Lefeuvre.
+ - Update copyright years.
+ * Bump compatibility to 9 (and dependency on debhelper to (> 9)).
+
+ -- Hugo Lefeuvre <hle at debian.org> Wed, 24 Aug 2016 11:34:14 +0200
python-igraph (0.7.1.post6-2) unstable; urgency=medium
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 7bcbaab..cb8e1e1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,17 @@ Source: python-igraph
Section: python
Priority: extra
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: TANIGUCHI Takaki <takaki at debian.org>
-Build-Depends: debhelper (>= 8.0.0),
- python-all-dev,
- python-setuptools,
- python3-all-dev,
- python3-setuptools,
- libigraph-dev,
- pkg-config
-Standards-Version: 3.9.6
-Homepage: http://igraph.sourceforge.net/
+Uploaders: TANIGUCHI Takaki <takaki at debian.org>,
+ Hugo Lefeuvre <hle at debian.org>
+Build-Depends: debhelper (>= 9),
+ python-all-dev,
+ python-setuptools,
+ python3-all-dev,
+ python3-setuptools,
+ libigraph-dev,
+ pkg-config
+Standards-Version: 3.9.8
+Homepage: http://igraph.org/python/
Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-igraph.git
Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-igraph.git
diff --git a/debian/copyright b/debian/copyright
index 870e809..da28d2a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,16 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: python-igraph
Source: http://pypi.python.org/pypi/python-igraph
Files: *
Copyright:
- 2006-2009 Gabor Csardi <csardi at rmki.kfki.hu>,
+ 2006-2016 Gabor Csardi <csardi at rmki.kfki.hu>,
Tamas Nepusz <tamas at cs.rhul.ac.uk>
License: GPL-2.0+
Files: debian/*
-Copyright: 2012 TANIGUCHI Takaki <takaki at debian.org>
+Copyright: 2012-2016 TANIGUCHI Takaki <takaki at debian.org>
+ 2016 Hugo Lefeuvre <hle at debian.org>
License: GPL-2.0+
License: GPL-2.0+
diff --git a/debian/patches/fix-test-case-failures.patch b/debian/patches/fix-test-case-failures.patch
new file mode 100644
index 0000000..38eb077
--- /dev/null
+++ b/debian/patches/fix-test-case-failures.patch
@@ -0,0 +1,149 @@
+Subject: Fix some test case failures on i386.
+Origin: upstream
+Bug-Debian: https://bugs.debian.org/806383
+Applied-Upstream: https://github.com/igraph/python-igraph/commit/17df5c301a952e4894db4e4a8963d85527fdc860
+
+--- a/igraph/test/decomposition.py 2016-08-24 11:32:21.187287419 +0200
++++ b/igraph/test/decomposition.py 2016-08-24 11:50:58.345023251 +0200
+@@ -141,15 +141,25 @@
+
+ class CommunityTests(unittest.TestCase):
+ def reindexMembership(self, cl):
++ if hasattr(cl, "membership"):
++ cl = cl.membership
+ idgen = UniqueIdGenerator()
+- return [idgen[i] for i in cl.membership]
++ return [idgen[i] for i in cl]
++
++ def assertMembershipsEqual(self, observed, expected):
++ if hasattr(observed, "membership"):
++ observed = observed.membership
++ if hasattr(expected, "membership"):
++ expected = expected.membership
++ self.assertEqual(self.reindexMembership(expected), \
++ self.reindexMembership(observed))
+
+ def testClauset(self):
+ # Two cliques of size 5 with one connecting edge
+ g = Graph.Full(5) + Graph.Full(5)
+ g.add_edges([(0, 5)])
+ cl = g.community_fastgreedy().as_clustering()
+- self.assertEqual(cl.membership, [0,0,0,0,0,1,1,1,1,1])
++ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1])
+ self.assertAlmostEqual(cl.q, 0.4523, places=3)
+
+ # Lollipop, weighted
+@@ -157,46 +167,46 @@
+ g.add_edges([(3,4)])
+ weights = [1, 1, 1, 1, 1, 1, 10, 10]
+ cl = g.community_fastgreedy(weights).as_clustering()
+- self.assertEqual(cl.membership, [0, 0, 0, 1, 1, 1])
++ self.assertMembershipsEqual(cl, [0,0,0,1,1,1])
+ self.assertAlmostEqual(cl.q, 0.1708, places=3)
+
+ # Same graph, different weights
+ g.es["weight"] = [3] * g.ecount()
+ cl = g.community_fastgreedy("weight").as_clustering()
+- self.assertEqual(cl.membership, [0, 0, 0, 0, 1, 1])
++ self.assertMembershipsEqual(cl, [0,0,0,0,1,1])
+ self.assertAlmostEqual(cl.q, 0.1796, places=3)
+
+ # Disconnected graph
+ g = Graph.Full(4) + Graph.Full(4) + Graph.Full(3) + Graph.Full(2)
+ cl = g.community_fastgreedy().as_clustering()
+- self.assertEqual(cl.membership, [0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 3])
++ self.assertMembershipsEqual(cl, [0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 3])
+
+ # Empty graph
+ g = Graph(20)
+ cl = g.community_fastgreedy().as_clustering()
+- self.assertEqual(cl.membership, range(g.vcount()))
++ self.assertMembershipsEqual(cl, range(g.vcount()))
+
+ def testEdgeBetweenness(self):
+ # Full graph, no weights
+ g = Graph.Full(5)
+ cl = g.community_edge_betweenness().as_clustering()
+- self.assertEqual(cl.membership, [0]*5)
++ self.assertMembershipsEqual(cl, [0]*5)
+
+ # Full graph with weights
+ g.es["weight"] = 1
+ g[0,1] = g[1,2] = g[2,0] = g[3,4] = 10
+ cl = g.community_edge_betweenness(weights="weight").as_clustering()
+- self.assertEqual(cl.membership, [0,0,0,1,1])
++ self.assertMembershipsEqual(cl, [0,0,0,1,1])
+ self.assertAlmostEqual(cl.q, 0.2750, places=3)
+
+ def testEigenvector(self):
+ g = Graph.Full(5) + Graph.Full(5)
+ g.add_edges([(0, 5)])
+ cl = g.community_leading_eigenvector()
+- self.assertTrue(cl.membership == [0,0,0,0,0,1,1,1,1,1])
++ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1])
+ self.assertAlmostEqual(cl.q, 0.4523, places=3)
+ cl = g.community_leading_eigenvector(2)
+- self.assertTrue(cl.membership == [0,0,0,0,0,1,1,1,1,1])
++ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1])
+ self.assertAlmostEqual(cl.q, 0.4523, places=3)
+
+ def testInfomap(self):
+@@ -204,7 +214,7 @@
+ cl = g.community_infomap()
+ self.assertAlmostEqual(cl.codelength, 4.60605, places=3)
+ self.assertAlmostEqual(cl.q, 0.40203, places=3)
+- self.assertTrue(cl.membership == [1,1,1,1,2,2,2,1,0,1,2,1,1,1,0,0,2,1,0,1,0,1] + [0]*12)
++ self.assertMembershipsEqual(cl, [1,1,1,1,2,2,2,1,0,1,2,1,1,1,0,0,2,1,0,1,0,1] + [0]*12)
+
+ # Smoke testing with vertex and edge weights
+ v_weights = [random.randint(1, 5) for _ in xrange(g.vcount())]
+@@ -223,7 +233,7 @@
+ g.es["weight"] = [2, 1, 2]
+ g.vs["initial"] = [0, -1, -1, 1]
+ cl = g.community_label_propagation("weight", "initial", [1,0,0,1])
+- self.assertTrue(cl.membership == [0, 0, 1, 1])
++ self.assertMembershipsEqual(cl, [0,0,1,1])
+ cl = g.community_label_propagation(initial="initial", fixed=[1,0,0,1])
+ self.assertTrue(cl.membership == [0, 0, 1, 1] or \
+ cl.membership == [0, 1, 1, 1] or \
+@@ -240,8 +250,8 @@
+ (10,14), (11,13)]
+ cls = g.community_multilevel(return_levels=True)
+ self.assertTrue(len(cls) == 2)
+- self.assertTrue(cls[0].membership == [0,0,0,1,0,0,1,1,2,2,2,3,2,3,2,2])
+- self.assertTrue(cls[1].membership == [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1])
++ self.assertMembershipsEqual(cls[0], [1,1,1,0,1,1,0,0,2,2,2,3,2,3,2,2])
++ self.assertMembershipsEqual(cls[1], [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1])
+ self.assertAlmostEqual(cls[0].q, 0.346301, places=5)
+ self.assertAlmostEqual(cls[1].q, 0.392219, places=5)
+
+@@ -251,7 +261,7 @@
+
+ cl = g.community_optimal_modularity()
+ self.assertTrue(len(cl) == 2)
+- self.assertTrue(cl.membership == [0, 0, 1, 0, 1])
++ self.assertMembershipsEqual(cl, [0, 0, 1, 0, 1])
+ self.assertAlmostEqual(cl.q, 0.08, places=7)
+
+ ws = [i % 5 for i in xrange(g.ecount())]
+@@ -262,7 +272,7 @@
+ g = Graph.Famous("zachary")
+ cl = g.community_optimal_modularity()
+ self.assertTrue(len(cl) == 4)
+- self.assertTrue(cl.membership == [0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 1, \
++ self.assertMembershipsEqual(cl, [0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 1, \
+ 0, 0, 0, 2, 2, 1, 0, 2, 0, 2, 0, 2, 3, 3, 3, 2, 3, 3, \
+ 2, 2, 3, 2, 2])
+ self.assertAlmostEqual(cl.q, 0.4197896, places=7)
+@@ -293,9 +303,9 @@
+ g = Graph.Full(5) + Graph.Full(5) + Graph.Full(5)
+ g += [(0,5), (5,10), (10, 0)]
+ cl = g.community_walktrap().as_clustering()
+- self.assertTrue(cl.membership == [0,0,0,0,0,1,1,1,1,1,2,2,2,2,2])
++ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1,2,2,2,2,2])
+ cl = g.community_walktrap(steps=3).as_clustering()
+- self.assertTrue(cl.membership == [0,0,0,0,0,1,1,1,1,1,2,2,2,2,2])
++ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1,2,2,2,2,2])
+
+
+ class CohesiveBlocksTests(unittest.TestCase):
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..62ce41b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-test-case-failures.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-igraph.git
More information about the Python-modules-commits
mailing list