[Python-modules-commits] r31940 - in packages/unittest2/trunk/debian (changelog control rules)

[zyga-guest at users.alioth.debian.org]

    Date: Wednesday, March 4, 2015 @ 13:22:00
  Author: zyga-guest
Revision: 31940

* New upstream release
* Port to pybuild 

Modified:
  packages/unittest2/trunk/debian/changelog
  packages/unittest2/trunk/debian/control
  packages/unittest2/trunk/debian/rules

Modified: packages/unittest2/trunk/debian/changelog
===================================================================
--- packages/unittest2/trunk/debian/changelog	2015-03-04 12:41:45 UTC (rev 31939)
+++ packages/unittest2/trunk/debian/changelog	2015-03-04 13:22:00 UTC (rev 31940)
@@ -1,4 +1,4 @@
-unittest2 (0.5.1-2ubuntu1) UNRELEASED; urgency=low
+unittest2 (0.8.0-1ubuntu1) UNRELEASED; urgency=low
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
@@ -15,8 +15,10 @@
   [ Zygmunt Krynicki ]
   * Update debian/watch to use pypi redirector 
   * Use wrap-and-sort on everything
+  * New upstream release
+  * Port to pybuild 
 
- -- Zygmunt Krynicki <zygmunt.krynicki at canonical.com>  Wed, 04 Mar 2015 12:47:42 +0100
+ -- Zygmunt Krynicki <zygmunt.krynicki at canonical.com>  Wed, 04 Mar 2015 14:20:03 +0100
 
 unittest2 (0.5.1-1) unstable; urgency=low
 

Modified: packages/unittest2/trunk/debian/control
===================================================================
--- packages/unittest2/trunk/debian/control	2015-03-04 12:41:45 UTC (rev 31939)
+++ packages/unittest2/trunk/debian/control	2015-03-04 13:22:00 UTC (rev 31940)
@@ -4,7 +4,7 @@
 Maintainer: Sandro Tosi <morph at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.4.2), dh-python
-Build-Depends-Indep: python-all
+Build-Depends-Indep: python-all, python-setuptools, python-six
 Standards-Version: 3.9.5
 XS-Python-Version: all
 Homepage: http://pypi.python.org/pypi/unittest2

Modified: packages/unittest2/trunk/debian/rules
===================================================================
--- packages/unittest2/trunk/debian/rules	2015-03-04 12:41:45 UTC (rev 31939)
+++ packages/unittest2/trunk/debian/rules	2015-03-04 13:22:00 UTC (rev 31940)
@@ -1,27 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+export PYBUILD_NAME=unittest2
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PYVERS:=$(shell pyversions -s)
-
 %:
-	dh  $@ --with python2
+	dh $@ --with=python2 --buildsystem=pybuild
 
-override_dh_auto_install:
-	dh_auto_install
-	# it's just 'unit2' but it's targetted to windows systems
-	rm $(CURDIR)/debian/python-unittest2/usr/bin/unit2.py
-
+# Tests cannot run without unittest2 running them.
+# See: https://code.google.com/p/unittest-ext/issues/detail?id=93 for details
 override_dh_auto_test:
-ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
-	for python in $(PYVERS) ; do \
-	    # retrive the lib path \
-	    LIB=$$($$python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_purelib") ; \
-	    # retrieve the script path \
-	    SCRIPT=$$($$python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_scripts") ; \
-	    # call the unit2 test script discovering the current LIB dir \
-	    PYTHONPATH=$$LIB $$python $$SCRIPT/unit2 discover -s $$LIB ; \
-	done
-endif
+	dh_auto_test -- --system=custom --test-args='{interpreter} -m unittest2'