Merge lp:~sylvain-pineau/checkbox/vendor_removal_raring_onwards_packaging into lp:~checkbox-dev/checkbox/checkbox-packaging

[Sylvain Pineau]

MR for the packaging branch.

This proposal removes the vendorized sw of plainbox for 13.04+ builds.
As Raring is the first release providing python3.3 (inspect.Signature) and unittest.mock (1.0).

Only extcmd will remain in plainbox/vendor.

I'm using a combination of inline replacements (for mock) and patches (for funcsigs).

[Zygmunt Krynicki (zyga)]

57 + rm -rf $(CURDIR)/plainbox/plainbox/vendor/mock.py

probably -f is sufficient, I always find rm -rf 'anything scary

Otherwise looks good

[lp:~sylvain-pineau/checkbox/vendor_removal_raring_onwards_packaging]

32. By Sylvain Pineau on 2013-11-05

debian:rules: Remove vendorized modules (in Ubuntu 13.04 onwards)

- Remove explicitly the funcsigs and mock modules in the build target
- Clean the plainbox code (with a quilt patch and inline replacements)

[Sylvain Pineau (sylvain-pineau)]

rm -f is enough. Fixed

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

Thanks, looks great :-)

review: Approve

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-11-05 14:49:36 +0000
@@ -0,0 +1,1 @@
+vendorized_packages_removal.patch

=== added file 'debian/patches/vendorized_packages_removal.patch'
--- debian/patches/vendorized_packages_removal.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/vendorized_packages_removal.patch	2013-11-05 14:49:36 +0000
@@ -0,0 +1,22 @@
+Description: Remove the vendorized funcsigs module
+Author: Sylvain Pineau <[e-mail]>
+Origin: upstream
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/plainbox/plainbox/impl/service.py
++++ b/plainbox/plainbox/impl/service.py
+@@ -28,13 +28,7 @@ import functools
+ import itertools
+ import logging
+ 
+-try:
+-    from inspect import Signature
+-except ImportError:
+-    try:
+-        from plainbox.vendor.funcsigs import Signature
+-    except ImportError:
+-        raise SystemExit("DBus parts require 'funcsigs' from pypi.")
++from inspect import Signature
+ from plainbox.vendor import extcmd
+ 
+ from plainbox.abc import IJobResult

=== modified file 'debian/rules'
--- debian/rules	2013-11-04 15:29:28 +0000
+++ debian/rules	2013-11-05 14:49:36 +0000
@@ -3,6 +3,8 @@
 # Prevent setuptools/distribute from accessing the internet.
 export http_proxy=http://127.0.9.1:9
 
+RELEASE_GTE_RARING	:= $(shell expr `lsb_release -rs` \>= 13.04)
+
 %:
 	dh "$@" --with python3,sphinxdoc,translations
 
@@ -21,6 +23,17 @@
 	dh_clean
 
 override_dh_auto_build:
+ifeq (1,$(RELEASE_GTE_RARING))
+	# funcsigs.Signature (the backport) is part of the Python standard library,
+	# available as inspect.Signature in Python 3.3 onwards.
+	rm -rf $(CURDIR)/plainbox/plainbox/vendor/funcsigs
+	# mock is now part of the Python standard library, available as
+	# unittest.mock in Python 3.3 onwards.
+	rm -f $(CURDIR)/plainbox/plainbox/vendor/mock.py
+	find $(CURDIR)/plainbox -type f -iname "test*.py" -execdir sed -i -e 's/plainbox\.vendor\.mock/unittest\.mock/' {} \;
+	find $(CURDIR)/plainbox -type f -iname "test*.py" -execdir sed -i -e 's/plainbox\.vendor import mock/unittest import mock/' {} \;
+	dh_quilt_patch
+endif
 	cd $(CURDIR)/plainbox && ./setup.py build
 	cd $(CURDIR)/checkbox-old && ./setup.py build
 	cd $(CURDIR)/checkbox-ng && ./setup.py build