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

[morph at users.alioth.debian.org]

    Date: Sunday, November 2, 2014 @ 20:10:28
  Author: morph
Revision: 31368

debian/patches/{2e27964ce86e8f49c496e5a549237ff6b1763e9a*.patch, 
ignore-decoding.patch}

Modified:
  packages/python-pygraphviz/trunk/debian/changelog
  packages/python-pygraphviz/trunk/debian/patches/series
Deleted:
  packages/python-pygraphviz/trunk/debian/patches/2e27964ce86e8f49c496e5a549237ff6b1763e9a.patch

Modified: packages/python-pygraphviz/trunk/debian/changelog
===================================================================
--- packages/python-pygraphviz/trunk/debian/changelog	2014-11-02 19:36:32 UTC (rev 31367)
+++ packages/python-pygraphviz/trunk/debian/changelog	2014-11-02 20:10:28 UTC (rev 31368)
@@ -1,10 +1,11 @@
 python-pygraphviz (1.3~rc2-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
-  * debian/patches/ignore-decoding.patch
+  * debian/patches/{2e27964ce86e8f49c496e5a549237ff6b1763e9a*.patch, 
+                    ignore-decoding.patch}
     - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Sun, 02 Nov 2014 19:36:23 +0000
+ -- Sandro Tosi <morph at debian.org>  Sun, 02 Nov 2014 19:59:10 +0000
 
 python-pygraphviz (1.3~rc1-1) unstable; urgency=medium
 

Deleted: packages/python-pygraphviz/trunk/debian/patches/2e27964ce86e8f49c496e5a549237ff6b1763e9a.patch
===================================================================
--- packages/python-pygraphviz/trunk/debian/patches/2e27964ce86e8f49c496e5a549237ff6b1763e9a.patch	2014-11-02 19:36:32 UTC (rev 31367)
+++ packages/python-pygraphviz/trunk/debian/patches/2e27964ce86e8f49c496e5a549237ff6b1763e9a.patch	2014-11-02 20:10:28 UTC (rev 31368)
@@ -1,87 +0,0 @@
-From b0e480e64125cd2893b49be33a4077a6ede4c1d3 Mon Sep 17 00:00:00 2001
-From: Aric Hagberg <aric.hagberg at gmail.com>
-Date: Sun, 21 Sep 2014 15:07:56 -0600
-
-Fixes #24
----
- pygraphviz/__init__.py           | 3 +--
- pygraphviz/tests/__init__.py     | 8 --------
- pygraphviz/tests/test_unicode.py | 5 ++++-
- setup.py                         | 5 ++---
- setup_egg.py                     | 4 ++--
- 5 files changed, 9 insertions(+), 16 deletions(-)
-
-diff --git a/pygraphviz/__init__.py b/pygraphviz/__init__.py
-index a099307..68b72b2 100644
---- a/pygraphviz/__init__.py
-+++ b/pygraphviz/__init__.py
-@@ -72,5 +72,4 @@ def version():
-     neato=_get_prog('neato')
-     os.system(neato+' -V')
- 
--# import tests: run as pygraphviz.test()
--# from .tests import run as test
-+from pygraphviz.tests.test import run as test
-diff --git a/pygraphviz/tests/__init__.py b/pygraphviz/tests/__init__.py
-index 02d64ad..e69de29 100644
---- a/pygraphviz/tests/__init__.py
-+++ b/pygraphviz/tests/__init__.py
-@@ -1,8 +0,0 @@
--import unittest
--
--def run():
--    """Runs the testsuite as command line application."""
--    try:
--        unittest.main(testLoader=BetterLoader(), defaultTest='suite')
--    except Exception as e:
--        print('Error: %s' % e)
-diff --git a/pygraphviz/tests/test_unicode.py b/pygraphviz/tests/test_unicode.py
-index 486fbeb..68f320a 100644
---- a/pygraphviz/tests/test_unicode.py
-+++ b/pygraphviz/tests/test_unicode.py
-@@ -2,7 +2,10 @@
- from __future__ import unicode_literals
- from nose.tools import *
- import pygraphviz as pgv
--from pygraphviz.agraph import _TEXT_TYPE
-+import sys
-+_PY2 = sys.version_info[0] == 2
-+_TEXT_TYPE = unicode if _PY2 else str
-+
- 
- def test_name_unicode():
-     A = pgv.AGraph(name='unicode')
-diff --git a/setup.py b/setup.py
-index a81d754..235307d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -20,8 +20,8 @@
-     print("To install, run 'python setup.py install'")
-     print()
- 
--if sys.version_info[:2] < (2, 4):
--    print("PyGraphviz requires Python version 2.4 or later (%d.%d detected)." % \
-+if sys.version_info[:2] < (2, 6):
-+    print("PyGraphviz requires Python version 2.6 or later (%d.%d detected)." % \
-           sys.version_info[:2])
-     sys.exit(-1)
- 
-@@ -151,4 +151,3 @@
-         ext_modules=extension,
-         package_data=package_data
-     )
--
-diff --git a/setup_egg.py b/setup_egg.py
-index 5bc313a..9ac9421 100755
---- a/setup_egg.py
-+++ b/setup_egg.py
-@@ -54,8 +54,8 @@
-         data_files       = data,
-         ext_modules      = extension,
-         package_data     = package_data,
--        install_requires=['setuptools'],
-         include_package_data = True,
--        test_suite       = "pygraphviz.tests.test.test_suite", 
-+        test_suite       = 'nose.collector',
-+        tests_require    = ['nose>=0.10.1'],
-         )

Modified: packages/python-pygraphviz/trunk/debian/patches/series
===================================================================
--- packages/python-pygraphviz/trunk/debian/patches/series	2014-11-02 19:36:32 UTC (rev 31367)
+++ packages/python-pygraphviz/trunk/debian/patches/series	2014-11-02 20:10:28 UTC (rev 31368)
@@ -1,4 +1,2 @@
 dont_install_data.patch
-2e27964ce86e8f49c496e5a549237ff6b1763e9a.patch
-2e27964ce86e8f49c496e5a549237ff6b1763e9a-2.patch
 dont-import-tests.patch