Package: python-testtools
Version: 0.9.39-1
Followup-For: Bug #777248

Dear Maintainer,

In Ubuntu, we've applied the following changes to this package:

  * New upstream release (1.4.0):
    - d/control: Add BD on python{3}-unittest2 >= 0.8.0.
    - d/control: Add BD on python3-extras.
  * Update watch file to use Debian pypi redirector.
  * Tweak execution of unit tests to ensure Python 3 is actually used.
  * Add BD on dh-python.
  * Bumped Standards-Version to 3.9.6, no changes.
  * Wrap and sort.

This includes a version bump to 1.4.0 which is compatible with the unittest2 
version in experimental.

This patch depends the python3 enablement of unittest2 as detail in 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777645

-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily'), 
(100, 'wily-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.19.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages python-testtools depends on:
ii  python                2.7.9-1
ii  python-extras         0.0.3-3
ii  python-mimeparse      0.1.4-1build1
ii  python-pkg-resources  17.0-1

Versions of packages python-testtools recommends:
ii  python-fixtures  1.0.0-01ubuntu1

Versions of packages python-testtools suggests:
pn  python-testtools-doc  <none>
ii  python-twisted        14.0.2-1ubuntu1

-- no debconf information
=== modified file 'debian/control'
--- debian/control	2014-08-29 10:35:16 +0000
+++ debian/control	2015-06-19 10:12:32 +0000
@@ -5,8 +5,9 @@
            Jelmer Vernooij <jel...@debian.org>
 Section: python
 Priority: optional
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9),
+               dh-python,
                python-all (>= 2.6.6-3~),
                python-extras,
                python-fixtures (>= 0.3.12~),
@@ -15,9 +16,12 @@
                python-sphinx,
                python-testresources (>= 0.2.7),
                python-twisted,
+               python-unittest2 (>= 0.8.0),
                python3-all,
+               python3-extras,
                python3-mimeparse,
-               python3-setuptools
+               python3-setuptools,
+               python3-unittest2 (>= 0.8.0)
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.0
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-testtools/trunk/
@@ -27,11 +31,14 @@
 
 Package: python-testtools
 Architecture: all
-Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
+Depends: python-pkg-resources,
+         python-unittest2 (>= 0.8.0),
+         ${misc:Depends},
+         ${python:Depends}
 Provides: ${python:Provides}
 Breaks: python-subunit (<< 0.0.6)
 Recommends: python-fixtures
-Suggests: python-twisted, python-testtools-doc
+Suggests: python-testtools-doc, python-twisted
 Description: Extensions to the Python unittest library - Python 2.x
  testtools (formerly pyunit3k) is a set of extensions to the Python standard
  library's unit testing framework. These extensions have been derived from
@@ -44,7 +51,10 @@
 
 Package: python3-testtools
 Architecture: all
-Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
+Depends: python3-pkg-resources,
+         python3-unittest2 (>= 0.8.0),
+         ${misc:Depends},
+         ${python3:Depends}
 Suggests: python-testtools-doc
 Provides: ${python:Provides}
 Description: Extensions to the Python unittest library - Python 3.x

=== modified file 'debian/patches/neutralize-failing-test.patch'
--- debian/patches/neutralize-failing-test.patch	2013-07-20 07:22:17 +0000
+++ debian/patches/neutralize-failing-test.patch	2015-06-18 16:12:19 +0000
@@ -3,9 +3,9 @@
 Forwarded: no
 Last-Update: 2013-07-20
 
---- python-testtools-0.9.32.orig/testtools/tests/test_testresult.py
-+++ python-testtools-0.9.32/testtools/tests/test_testresult.py
-@@ -770,6 +770,7 @@ class TestStreamToDict(TestCase):
+--- a/testtools/tests/test_testresult.py
++++ b/testtools/tests/test_testresult.py
+@@ -772,6 +772,7 @@ class TestStreamToDict(TestCase):
      def test_bad_mime(self):
          # Testtools was making bad mime types, this tests that the specific
          # corruption is catered for.

=== modified file 'debian/rules'
--- debian/rules	2014-08-29 10:35:16 +0000
+++ debian/rules	2015-06-19 09:55:42 +0000
@@ -30,6 +30,6 @@
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
 	set -ex && for pyvers in $(PYTHONS) $(PYTHON3S); do \
-		PYTHONPATH=. PYTHON=python$$pyvers $(MAKE) -C $(CURDIR) check ; \
+		PYTHONPATH=. python$$pyvers -m testtools.run testtools.tests.test_suite ; \
 	done
 endif

=== modified file 'debian/watch'
--- debian/watch	2013-02-15 12:18:38 +0000
+++ debian/watch	2015-06-19 10:08:32 +0000
@@ -1,2 +1,3 @@
 version=3
-https://github.com/testing-cabal/testtools/tags .*/testtools-(\d[\d\.]+)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/testtools/testtools-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

Reply via email to