[Python-modules-commits] r33310 - in packages/unittest2/trunk/debian (11 files)

[zigo at users.alioth.debian.org]

    Date: Thursday, July 9, 2015 @ 09:05:45
  Author: zigo
Revision: 33310

Continued Py3 support:
    - Modified debian/rules to add --with python3.
    - Removed argparse from requirements in setup.py (in d/patches).
    - Adds update-alternatives to handle /usr/bin/unit2.

Added:
  packages/unittest2/trunk/debian/patches/
  packages/unittest2/trunk/debian/patches/drop-argparse.patch
  packages/unittest2/trunk/debian/patches/series
  packages/unittest2/trunk/debian/python-unittest2.postinst
  packages/unittest2/trunk/debian/python-unittest2.postrm
  packages/unittest2/trunk/debian/python-unittest2.prerm
  packages/unittest2/trunk/debian/python3-unittest2.postinst
  packages/unittest2/trunk/debian/python3-unittest2.postrm
  packages/unittest2/trunk/debian/python3-unittest2.prerm
Modified:
  packages/unittest2/trunk/debian/changelog
  packages/unittest2/trunk/debian/rules

Modified: packages/unittest2/trunk/debian/changelog
===================================================================
--- packages/unittest2/trunk/debian/changelog	2015-07-09 08:55:41 UTC (rev 33309)
+++ packages/unittest2/trunk/debian/changelog	2015-07-09 09:05:45 UTC (rev 33310)
@@ -1,6 +1,9 @@
 unittest2 (1.1.0-2) experimental; urgency=medium
 
-  * Added Python 3 support.
+  * Added Python 3 support:
+    - Modified debian/rules to add --with python3.
+    - Removed argparse from requirements in setup.py (in d/patches).
+    - Adds update-alternatives to handle /usr/bin/unit2.
 
  -- Thomas Goirand <zigo at debian.org>  Thu, 09 Jul 2015 08:55:11 +0000
 

Added: packages/unittest2/trunk/debian/patches/drop-argparse.patch
===================================================================
--- packages/unittest2/trunk/debian/patches/drop-argparse.patch	                        (rev 0)
+++ packages/unittest2/trunk/debian/patches/drop-argparse.patch	2015-07-09 09:05:45 UTC (rev 33310)
@@ -0,0 +1,18 @@
+Description: Drop requirement for argparse
+ Ubuntu and Debian both ship minimum python versions that include
+ argparse; drop this from REQUIRES as its breaks the py3 unit tests
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+Last-Update: 2015-07-09
+
+--- unittest2-1.1.0.orig/setup.py
++++ unittest2-1.1.0/setup.py
+@@ -57,7 +57,7 @@ KEYWORDS = "unittest testing tests".spli
+ # Both install and setup requires - because we read VERSION from within the
+ # package, and the package also exports all the APIs.
+ # six for compat helpers
+-REQUIRES = ['argparse', 'six>=1.4', 'traceback2'],
++REQUIRES = ['six>=1.4', 'traceback2'],
+ 
+ params = dict(
+     name=NAME,

Added: packages/unittest2/trunk/debian/patches/series
===================================================================
--- packages/unittest2/trunk/debian/patches/series	                        (rev 0)
+++ packages/unittest2/trunk/debian/patches/series	2015-07-09 09:05:45 UTC (rev 33310)
@@ -0,0 +1 @@
+drop-argparse.patch

Added: packages/unittest2/trunk/debian/python-unittest2.postinst
===================================================================
--- packages/unittest2/trunk/debian/python-unittest2.postinst	                        (rev 0)
+++ packages/unittest2/trunk/debian/python-unittest2.postinst	2015-07-09 09:05:45 UTC (rev 33310)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+	update-alternatives --install /usr/bin/unit2 unit2 /usr/bin/python2-unit2 300
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/unittest2/trunk/debian/python-unittest2.postrm
===================================================================
--- packages/unittest2/trunk/debian/python-unittest2.postrm	                        (rev 0)
+++ packages/unittest2/trunk/debian/python-unittest2.postrm	2015-07-09 09:05:45 UTC (rev 33310)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
+	update-alternatives --remove unit2 /usr/bin/python2-unit2
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/unittest2/trunk/debian/python-unittest2.prerm
===================================================================
--- packages/unittest2/trunk/debian/python-unittest2.prerm	                        (rev 0)
+++ packages/unittest2/trunk/debian/python-unittest2.prerm	2015-07-09 09:05:45 UTC (rev 33310)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] ; then
+	update-alternatives --remove unit2 /usr/bin/python2-unit2
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/unittest2/trunk/debian/python3-unittest2.postinst
===================================================================
--- packages/unittest2/trunk/debian/python3-unittest2.postinst	                        (rev 0)
+++ packages/unittest2/trunk/debian/python3-unittest2.postinst	2015-07-09 09:05:45 UTC (rev 33310)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+	update-alternatives --install /usr/bin/unit2 unit2 /usr/bin/python3-unit2 200
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/unittest2/trunk/debian/python3-unittest2.postrm
===================================================================
--- packages/unittest2/trunk/debian/python3-unittest2.postrm	                        (rev 0)
+++ packages/unittest2/trunk/debian/python3-unittest2.postrm	2015-07-09 09:05:45 UTC (rev 33310)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
+	update-alternatives --remove unit2 /usr/bin/python2-unit2
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/unittest2/trunk/debian/python3-unittest2.prerm
===================================================================
--- packages/unittest2/trunk/debian/python3-unittest2.prerm	                        (rev 0)
+++ packages/unittest2/trunk/debian/python3-unittest2.prerm	2015-07-09 09:05:45 UTC (rev 33310)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] ; then
+	update-alternatives --remove unit2 /usr/bin/python2-unit2
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: packages/unittest2/trunk/debian/rules
===================================================================
--- packages/unittest2/trunk/debian/rules	2015-07-09 08:55:41 UTC (rev 33309)
+++ packages/unittest2/trunk/debian/rules	2015-07-09 09:05:45 UTC (rev 33310)
@@ -2,8 +2,13 @@
 export PYBUILD_NAME=unittest2
 
 %:
-	dh $@ --with=python2 --buildsystem=pybuild
+	dh $@ --with=python2,python3 --buildsystem=pybuild
 
+override_dh_install:
+	dh_install
+	mv $(CURDIR)/debian/python-unittest2/usr/bin/unit2 $(CURDIR)/debian/python-unittest2/usr/bin/python2-unit2
+	mv $(CURDIR)/debian/python3-unittest2/usr/bin/unit2 $(CURDIR)/debian/python3-unittest2/usr/bin/python3-unit2
+
 # 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: