[Python-modules-commits] r19731 - in packages/python-networkx/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Monday, December 26, 2011 @ 12:04:38
  Author: morph
Revision: 19731

* debian/patches/40_astar_unique_shortest_path.diff
  - removed, merged upstream

Modified:
  packages/python-networkx/trunk/debian/changelog
  packages/python-networkx/trunk/debian/patches/series
Deleted:
  packages/python-networkx/trunk/debian/patches/40_astar_unique_shortest_path.diff

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2011-12-26 12:04:11 UTC (rev 19730)
+++ packages/python-networkx/trunk/debian/changelog	2011-12-26 12:04:38 UTC (rev 19731)
@@ -3,8 +3,10 @@
   * New upstream release
   * debian/patches/10_doc_relocation
     - refreshed for new upstream code
+  * debian/patches/40_astar_unique_shortest_path.diff
+    - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Mon, 26 Dec 2011 13:03:48 +0100
+ -- Sandro Tosi <morph at debian.org>  Mon, 26 Dec 2011 13:04:19 +0100
 
 python-networkx (1.5-2) unstable; urgency=low
 

Deleted: packages/python-networkx/trunk/debian/patches/40_astar_unique_shortest_path.diff
===================================================================
--- packages/python-networkx/trunk/debian/patches/40_astar_unique_shortest_path.diff	2011-12-26 12:04:11 UTC (rev 19730)
+++ packages/python-networkx/trunk/debian/patches/40_astar_unique_shortest_path.diff	2011-12-26 12:04:38 UTC (rev 19731)
@@ -1,21 +0,0 @@
-Description: Modify tests so that shortest paths are unique.
-Author: Loïc Séguin-Charbonneau <loicseguin at gmail.com>
-Index: networkx/algorithms/shortest_paths/tests/test_astar.py
-===================================================================
---- python-networkx-1.5.orig/networkx/algorithms/shortest_paths/tests/test_astar.py	(revision 5f7037a6e21a4a568ab02a7ef72d53c694d2b58f)
-+++ python-networkx-1.5/networkx/algorithms/shortest_paths/tests/test_astar.py	(revision 7d793561cc24884da1d6ccfcb37a1987108e92db)
-@@ -56,4 +56,5 @@
-     def test_astar_undirected(self):
-         GG=self.XG.to_undirected()
-+        GG['y']['v']['weight'] = 2
-         assert nx.astar_path(GG,'s','v')==['s', 'x', 'u', 'v']
-         assert nx.astar_path_length(GG,'s','v')==8
-@@ -103,5 +104,7 @@
-     def test_astar_w1(self):
-         G=nx.DiGraph() 
--        G.add_edges_from([('s','u'), ('s','x'), ('u','v'), ('u','x'), ('v','y'), ('x','u'), ('x','v'), ('x','y'), ('y','s'), ('y','v')])
-+        G.add_edges_from([('s','u'), ('s','x'), ('u','v'), ('u','x'),
-+            ('v','y'), ('x','u'), ('x','w'), ('w', 'v'), ('x','y'),
-+            ('y','s'), ('y','v')])
-         assert nx.astar_path(G,'s','v')==['s', 'u', 'v']
-         assert nx.astar_path_length(G,'s','v')== 2

Modified: packages/python-networkx/trunk/debian/patches/series
===================================================================
--- packages/python-networkx/trunk/debian/patches/series	2011-12-26 12:04:11 UTC (rev 19730)
+++ packages/python-networkx/trunk/debian/patches/series	2011-12-26 12:04:38 UTC (rev 19731)
@@ -1,4 +1,3 @@
 10_doc_relocation
 20_example_dirs_remove
 30_use_local_objects.inv
-40_astar_unique_shortest_path.diff