[Python-modules-commits] r16089 - in packages/python-networkx/trunk/debian (5 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Thu Mar 10 18:44:07 UTC 2011
Date: Thursday, March 10, 2011 @ 18:44:03
Author: morph
Revision: 16089
* debian/patches/{40_add_networkxcss, 50_boundary-test-fix.patch
60_remove_svn_refs.diff 70_set_matplotlib_ps_backend.patch}
- removed since merged upstream
Modified:
packages/python-networkx/trunk/debian/changelog
Deleted:
packages/python-networkx/trunk/debian/patches/40_add_networkxcss
packages/python-networkx/trunk/debian/patches/50_boundary-test-fix.patch
packages/python-networkx/trunk/debian/patches/60_remove_svn_refs.diff
packages/python-networkx/trunk/debian/patches/70_set_matplotlib_ps_backend.patch
Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog 2011-03-10 18:02:08 UTC (rev 16088)
+++ packages/python-networkx/trunk/debian/changelog 2011-03-10 18:44:03 UTC (rev 16089)
@@ -11,8 +11,11 @@
- bump python-sphinx versioned b-d-i to 1.0.1 minimum
* debian/copyright
- bump upstream and packaging copyright years
+ * debian/patches/{40_add_networkxcss, 50_boundary-test-fix.patch
+ 60_remove_svn_refs.diff 70_set_matplotlib_ps_backend.patch}
+ - removed since merged upstream
- -- Sandro Tosi <morph at debian.org> Thu, 10 Mar 2011 19:01:45 +0100
+ -- Sandro Tosi <morph at debian.org> Thu, 10 Mar 2011 19:43:15 +0100
python-networkx (1.3-1) experimental; urgency=low
Deleted: packages/python-networkx/trunk/debian/patches/40_add_networkxcss
===================================================================
--- packages/python-networkx/trunk/debian/patches/40_add_networkxcss 2011-03-10 18:02:08 UTC (rev 16088)
+++ packages/python-networkx/trunk/debian/patches/40_add_networkxcss 2011-03-10 18:44:03 UTC (rev 16089)
@@ -1,44 +0,0 @@
-Description: add the missing networkx.css file from the tarball
-
-Index: python-networkx-1.3/doc/source/static/networkx.css
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ python-networkx-1.3/doc/source/static/networkx.css 2010-09-23 00:35:47.904872351 +0200
-@@ -0,0 +1,37 @@
-+ at import url("sphinxdoc.css");
-+
-+
-+div.admonition, div.warning {
-+ font-size: 1.00em;
-+ margin: 0em 0.em 0em 0;
-+ border: 0px;
-+ background-color: white;
-+}
-+
-+
-+div.admonition p.admonition-title,
-+div.warning p.admonition-title {
-+ padding: 0.1em 0 0.1em 0.0em;
-+ border: 0px solid #86989B;
-+ color: black;
-+ border-bottom: 0px solid #86989B;
-+ background-color: white;
-+}
-+
-+
-+body {
-+ min-width: 740px;
-+}
-+
-+div.bodywrapper {
-+ margin: 0 300px 0 0;
-+}
-+
-+
-+div.sphinxsidebar {
-+ width: 275px;
-+}
-+
-+dt:target, .highlight {
-+ background-color: #E3EFF1;
-+}
Deleted: packages/python-networkx/trunk/debian/patches/50_boundary-test-fix.patch
===================================================================
--- packages/python-networkx/trunk/debian/patches/50_boundary-test-fix.patch 2011-03-10 18:02:08 UTC (rev 16088)
+++ packages/python-networkx/trunk/debian/patches/50_boundary-test-fix.patch 2011-03-10 18:44:03 UTC (rev 16089)
@@ -1,19 +0,0 @@
-Description: Restrict node boundary test cases to valid range: the test was incorrectly checking cheeger constants for set size k > |V|/2.
-
-diff -r aef7b61db105 networkx/algorithms/tests/test_boundary.py
---- a/networkx/algorithms/tests/test_boundary.py Sun Sep 19 18:48:21 2010 -0400
-+++ b/networkx/algorithms/tests/test_boundary.py Mon Sep 20 07:59:47 2010 -0600
-@@ -97,13 +97,8 @@ class TestBoundary:
- return min([float(len(nx.node_boundary(G,sample(G.nodes(),k))))/k
- for n in range(100)])
-
- assert_almost_equals(cheeger(P,1),3.00,places=2)
- assert_almost_equals(cheeger(P,2),2.00,places=2)
- assert_almost_equals(cheeger(P,3),1.67,places=2)
- assert_almost_equals(cheeger(P,4),1.00,places=2)
- assert_almost_equals(cheeger(P,5),0.80,places=2)
-- assert_almost_equals(cheeger(P,6),0.50,places=2)
-- assert_almost_equals(cheeger(P,7),0.43,places=2)
-- assert_almost_equals(cheeger(P,8),0.25,places=2)
-- assert_almost_equals(cheeger(P,9),0.11,places=2)
-- assert_almost_equals(cheeger(P,10),0.00,places=2)
Deleted: packages/python-networkx/trunk/debian/patches/60_remove_svn_refs.diff
===================================================================
--- packages/python-networkx/trunk/debian/patches/60_remove_svn_refs.diff 2011-03-10 18:02:08 UTC (rev 16088)
+++ packages/python-networkx/trunk/debian/patches/60_remove_svn_refs.diff 2011-03-10 18:44:03 UTC (rev 16089)
@@ -1,46 +0,0 @@
-Description: Remove obsolete reference to SVN server.
-
-Index: python-networkx-1.3/doc/source/templates/index.html
-===================================================================
---- python-networkx-1.3.orig/doc/source/templates/index.html 2010-08-29 02:22:10.000000000 +0200
-+++ python-networkx-1.3/doc/source/templates/index.html 2010-12-09 02:00:15.023507750 +0100
-@@ -85,16 +85,5 @@
- <li>Allows easy access to almost any database</li>
- </ul>
-
-- <h2>Get NetworkX</h2>
--<blockquote>
-- <p>
-- NetworkX is available as an <a
-- href="http://peak.telecommunity.com/DevCenter/EasyInstall">easy-install</a>able
-- package on the <a href="http://pypi.python.org/pypi/networkx">Python Package
-- Index</a>.
-- </p>
-- <p>The code can be found on the NetworkX SVN server at
-- <tt><a href="http://networkx.lanl.gov/svn/networkx/trunk">http://networkx.lanl.gov/svn/networkx/trunk</a></tt>.</p>
--</blockquote>
-
- {% endblock %}
-Index: python-networkx-1.3/doc/source/download.rst
-===================================================================
---- python-networkx-1.3.orig/doc/source/download.rst 2010-12-09 02:00:21.988007077 +0100
-+++ python-networkx-1.3/doc/source/download.rst 2010-12-09 02:01:05.852006464 +0100
-@@ -8,15 +8,15 @@
-
- http://networkx.lanl.gov/download/networkx/
-
--Subversion source code repository
-+Mercurial source code repository
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *Anonymous*
-
--svn checkout http://networkx.lanl.gov/svn/networkx/trunk networkx
-+hg clone http://networkx.lanl.gov/hg/networkx
-
- *Authenticated*
-
--svn checkout https://networkx.lanl.gov/svn/networkx/trunk networkx
-+hg clone https://networkx.lanl.gov/hg/networkx
-
-
- Documentation
Deleted: packages/python-networkx/trunk/debian/patches/70_set_matplotlib_ps_backend.patch
===================================================================
--- packages/python-networkx/trunk/debian/patches/70_set_matplotlib_ps_backend.patch 2011-03-10 18:02:08 UTC (rev 16088)
+++ packages/python-networkx/trunk/debian/patches/70_set_matplotlib_ps_backend.patch 2011-03-10 18:44:03 UTC (rev 16089)
@@ -1,49 +0,0 @@
-Description: set matplotlib backend to PS to handle case with no DISPLAY environment.
-
-Index: python-networkx-1.3/networkx/drawing/nx_pylab.py
-===================================================================
---- python-networkx-1.3.orig/networkx/drawing/nx_pylab.py 2010-08-29 02:22:06.000000000 +0200
-+++ python-networkx-1.3/networkx/drawing/nx_pylab.py 2010-12-10 00:22:46.200507018 +0100
-@@ -902,6 +902,8 @@
- def setup_module(module):
- from nose import SkipTest
- try:
-+ import matplotlib as mpl
-+ mpl.use('PS')
- import pylab
- except:
- raise SkipTest("matplotlib not available")
-Index: python-networkx-1.3/networkx/drawing/tests/test_pylab.py
-===================================================================
---- python-networkx-1.3.orig/networkx/drawing/tests/test_pylab.py 2010-08-29 02:22:06.000000000 +0200
-+++ python-networkx-1.3/networkx/drawing/tests/test_pylab.py 2010-12-10 00:22:33.035506548 +0100
-@@ -15,9 +15,13 @@
- def setupClass(cls):
- global pylab
- try:
-+ import matplotlib as mpl
-+ mpl.use('PS')
- import pylab
- except ImportError:
- raise SkipTest('matplotlib not available.')
-+ except RuntimeError:
-+ raise SkipTest('matplotlib not available.')
-
- def setUp(self):
- self.G=nx.barbell_graph(5,10)
-@@ -27,12 +31,11 @@
- # hold(False)
- N=self.G
- nx.draw_spring(N)
-- pylab.savefig("test.png")
-+ pylab.savefig("test.ps")
- nx.draw_random(N)
- pylab.savefig("test.ps")
- nx.draw_circular(N)
-- pylab.savefig("test.png")
-+ pylab.savefig("test.ps")
- nx.draw_spectral(N)
-- pylab.savefig("test.png")
-- os.unlink('test.png')
-+ pylab.savefig("test.ps")
- os.unlink('test.ps')
More information about the Python-modules-commits
mailing list