Merge lp:~mitya57/ubuntu/raring/python3-defaults/resync into lp:ubuntu/raring/python3-defaults

[Dmitry Shachnev]

Resynchronized the package with Debian packaging bzr (3.3.0-2 is in NEW: http://ftp-master.debian.org/new/python3-defaults_3.3.0-2.html). New version includes pybuild (a new tool to build python packages) and DEP-8 tests.

Note that I am not able to verify that the tests pass in a clean environment (lp:auto-package-testing) (because I'm currently using my old laptop that kvm refuses to run on), so I will be happy if someone does that for me before merging.

[Martin Pitt (pitti)]

I tried running "run-adt-test -b lp:~mitya57/ubuntu/raring/python3-defaults/resync", but the package currently fails to build:

mkdir -p debian/libpython3-dev/usr/share/man/man1
ln -sf x86_64-linux-gnu-python3.3m-config.1.gz \
  debian/libpython3-dev/usr/share/man/man1/x86_64-linux-gnu-python3m-config.1.gz
ln -sf x86_64-linux-gnu-python3.3-config.1.gz \
  debian/libpython3-dev/usr/share/man/man1/x86_64-linux-gnu-python3-config.1.gz
ln -sf -python3.3m-config \
  debian/libpython3-dev/usr/bin/-python3m-config
ln: invalid option -- 'p'
Try 'ln --help' for more information.
make: *** [binary-arch] Error 1

[Martin Pitt (pitti)]

review: Needs Fixing

[lp:~mitya57/ubuntu/raring/python3-defaults/resync]

63. By Dmitry Shachnev on 2013-01-18

Include architecture.mk in debian/rules instead of defining DEB_HOST_* manually

64. By Dmitry Shachnev on 2013-01-18

Add a build-dependency on dpkg-dev (>= 1.16.1~), as suggested by lintian

65. By Dmitry Shachnev on 2013-01-18

tests/t1: Build-depend on python3-all instead of python-all.

66. By Dmitry Shachnev on 2013-01-18

Refactor tests to make them work without python-support installed.

[Martin Pitt (pitti)]

Tests pass now, good work!

review: Approve

[lp:~mitya57/ubuntu/raring/python3-defaults/resync]

67. By Dmitry Shachnev on 2013-01-18

debian/tests/control: Add a dependency on libjs-jquery (test1 contains
a symlink to /usr/share/javascript/jquery/jquery.js).

68. By Dmitry Shachnev on 2013-01-18

Fix debian/changelog (remove change that is actually applied in Debian)

[Barry Warsaw (barry)]

I can't tell if this is success or failure ;)

...
make[1]: Leaving directory `/tmp/tmp.hLZxoncJhj/ubtree0t-dh_python3-testtmp/adttmp/tests/t4'
adt-run: trace: & ubtree0t-dh_python3: ----------------------------------------]
adt-run: trace1: ** needs_reset, previously=False
adt-run: trace: @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ tests done.
adt-run: trace: ** stop
adt-run: trace: ** close, scratch=tb-scratch~/tmp/tmp.hLZxoncJhj:-/|/tmp/tmp.hLZxoncJhj/!
Warning: Permanently added '[localhost]:54323' (ECDSA) to the list of known hosts.
find: `./.autopkgtest/gpg': Permission denied
rm: cannot remove ‘./resync/tests/t4/setup.py’: Permission denied
rm: cannot remove ‘./resync/tests/t2/lib/bar.c’: Permission denied
rm: cannot remove ‘./resync/tests/t2/lib/__init__.py’: Permission denied
rm: cannot remove ‘./resync/.bzr/checkout/views’: Permission denied
rm: cannot remove ‘./resync/debpython/__init__.py’: Permission denied
Connection to localhost closed.
2013-01-18 01:48:17 PM: Info: Cleaning up

[Barry Warsaw (barry)]

It looks good to me too, but I'd like to give Matthias a chance to weigh in. I will happily sponsor this if he doesn't object.

review: Approve

[Piotr Ożarowski (piotr)]

can you update to what's in bzr on alioth?

I added "args" to one line too many, fortunately I noticed it before releasing, so

  dh.autoscript(package, 'prerm', 'prerm-py3clean', args)

is back to:

  dh.autoscript(package, 'prerm', 'prerm-py3clean', '')

review: Needs Fixing

[lp:~mitya57/ubuntu/raring/python3-defaults/resync]

69. By Dmitry Shachnev on 2013-01-24

* Update to upstream r259
* Revert dependency on dpkg-dev (>= 1.16.1~), precise has that version

[Dmitry Shachnev (mitya57)]

Updated to r259, thanks Piotr!

[lp:~mitya57/ubuntu/raring/python3-defaults/resync]

70. By Dmitry Shachnev on 2013-01-24

Bump the timestamp

[Barry Warsaw (barry)]

I'm going to upload this now, thanks for the great work!

(I was going to mention the following to you on IRC, but you're offline atm :)

You mentioned on IRC that you were going to announce pybuild on ubuntu-devel (yay!). It would also be great to start documenting pybuild on http://wiki.debian.org/Python/LibraryStyleGuide (and the parallel application guide). Even though we can't use this on Debian yet, let's start promoting this in preparation for Jessy (which of course, in limited cases we can start to play with in Raring).

We might need to reorganize the pages a bit. Hit me up on IRC and we can discuss details.

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-12-12 10:45:17 +0000
+++ Makefile	2013-01-24 11:51:20 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 INSTALL ?= install
 PREFIX ?= /usr/local
-MANPAGES ?= dh_python3.1 py3compile.1 py3clean.1
+MANPAGES ?= dh_python3.1 py3compile.1 py3clean.1 pybuild.1
 VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: (.+),\1,p')
 
 clean:
@@ -15,18 +15,21 @@
 	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)/bin \
 		$(DESTDIR)$(PREFIX)/share/python3/runtime.d \
 		$(DESTDIR)$(PREFIX)/share/debhelper/autoscripts/ \
-		$(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Sequence/
+		$(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Sequence/ \
+		$(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Buildsystem/
 	$(INSTALL) -m 755 runtime.d/* $(DESTDIR)$(PREFIX)/share/python3/runtime.d/
 	$(INSTALL) -m 644 autoscripts/* $(DESTDIR)$(PREFIX)/share/debhelper/autoscripts/
 	$(INSTALL) -m 755 dh_python3 $(DESTDIR)$(PREFIX)/bin/
 	sed -i -e 's/DEVELV/$(VERSION)/' $(DESTDIR)$(PREFIX)/bin/dh_python3
-	$(INSTALL) -m 644 python3.pm $(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Sequence/
+	$(INSTALL) -m 644 dh/python3.pm $(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Sequence/
+	$(INSTALL) -m 644 dh/pybuild.pm $(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Buildsystem/
 	$(INSTALL) -m 755 pybuild $(DESTDIR)$(PREFIX)/bin/
 	sed -i -e 's/DEVELV/$(VERSION)/' $(DESTDIR)$(PREFIX)/bin/pybuild
 
 install-runtime:
-	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)/share/python3/debpython $(DESTDIR)$(PREFIX)/bin
+	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)/share/python3/debpython/build $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) -m 644 debpython/*.py $(DESTDIR)$(PREFIX)/share/python3/debpython/
+	$(INSTALL) -m 644 debpython/build/*.py $(DESTDIR)$(PREFIX)/share/python3/debpython/build/
 	$(INSTALL) -m 755 py3compile $(DESTDIR)$(PREFIX)/bin/
 	sed -i -e 's/DEVELV/$(VERSION)/' $(DESTDIR)$(PREFIX)/bin/py3compile
 	$(INSTALL) -m 755 py3clean $(DESTDIR)$(PREFIX)/bin/
@@ -37,9 +40,6 @@
 %.1: %.rst
 	rst2man $< > $@
 
-pybuild.1: pybuild
-	help2man -N --version-string=version ./pybuild > $@
-
 manpages: $(MANPAGES)
 
 dist_fallback:

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-14 22:05:46 +0000
+++ debian/changelog	2013-01-24 11:51:20 +0000
@@ -1,3 +1,28 @@
+python3-defaults (3.3.0-2ubuntu5) raring; urgency=low
+
+  [ Piotr Ożarowski ]
+  * pybuild:
+    - add --ext-dest-dir (PYBUILD_EXT_DESTDIR) and --ext-pattern
+      (PYBUILD_EXT_PATTERN) options to move files after install step
+    - save before/after command logs if quiet mode is on
+    - do not warn about limiting versions if there's only one
+  * dh_python3: add version range to py3compile in maintainer scripts
+
+  [ Dmitry Shachnev ]
+  * Merge with Debian packaging bzr r259. Remaining changes:
+    - Drop python3.2 as a supported python3 version.
+    - Make python3-{all,all-dev,all-dbg} Multi-Arch: allowed.
+    - Move debiandoc-sgml and lsb-release from Build-Depends-Indep to
+      Build-Depends.
+  * Include architecture.mk in debian/rules instead of defining
+    DEB_HOST_* manually.
+  * tests/t1: Build-depend on python3-all instead of python-all.
+  * Make tests work without python-support installed.
+  * debian/tests/control: Add a dependency on libjs-jquery (test1 contains
+    a symlink to /usr/share/javascript/jquery/jquery.js).
+
+ -- Dmitry Shachnev <[e-mail]>  Thu, 24 Jan 2013 15:48:55 +0400
+
 python3-defaults (3.3.0-2ubuntu4) raring; urgency=low
 
   [ Piotr Ożarowski ]
@@ -32,15 +57,33 @@
   * dh_python3:
     - add multiarch support (rename extensions in dist-packages)
     - rename foomodule.so to foo.so in dist-packages (for Python >= 3.3)
+  * pybuild:
+    - add --{before,after}-{clean,configure,build,install,test}
+      command line options and many more PYBUILD_FOO environment vars
+      (f.e. PYBUILD_DESTDIR, PYBUILD_DESTDIR_python3,
+      PYBUILD_DESTDIR_python3.3-dbg)
+    - add --disable command line option (to disable step, interpreter, version
+      or any mix of them); drop --no-clean and --no-tests arguments
+      (replaced by --disable clean, --disable test or --disable 'clean test')
+    - add new build system to dh sequencer (dh --buildsystem=pybuild)
+    - add manpage
+  * Move python-docutils to Build-Depends (python3 package is now arch:any) 
 
   [ Matthias Klose ]
   * Build dependency packages as architecture dependent packages.
   * Make python3, python3-{minimal,dev,dbg} Multi-Arch: allowed.
   * Don't use the `u' abi flag when defaulting to 3.3.
-  * Build Multi-Arch: any packages libpython3-{dev,dbg} packages providing
+  * Build Multi-Arch: same packages libpython3-{dev,dbg} packages providing
     $(DEB_HOST_MULTIARCH)-python3-config symlinks.
-
- -- Matthias Klose <[e-mail]>  Wed, 12 Dec 2012 00:28:52 +0100
+  * Add Multi-Arch: same packages libpython3-all-{dev,dbg} (not yet built,
+    python3.2 doesn't have support for multiarch).
+
+  [ Dmitry Shachnev ]
+  * debpython/interpreter.py: fix failing doctest
+    (architecture no longer hardcoded)
+  * Added DEP-8 tests (Closes: #698002).
+
+ -- Piotr Ożarowski <[e-mail]>  Sat, 12 Jan 2013 17:13:14 +0100
 
 python3-defaults (3.3.0-1) experimental; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-12-12 11:09:30 +0000
+++ debian/control	2013-01-24 11:51:20 +0000
@@ -10,6 +10,7 @@
 Homepage: http://www.python.org/
 Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python3-defaults-debian
 Vcs-Browser: http://alioth.debian.org/scm/loggerhead/pkg-python/python3-defaults-debian/files
+XS-Testsuite: autopkgtest
 
 Package: python3
 Architecture: any
@@ -170,3 +171,32 @@
  .
  This package is a dependency package used as a build dependency for other
  packages to avoid hardcoded dependencies on specific Python 3 debug packages.
+
+#Package: libpython3-all-dev
+#Architecture: any
+#Multi-Arch: same
+#Depends: libpython3-dev (= ${binary:Version}), ${misc:Depends},
+# libpython3.3-dev
+#Description: package depending on all supported Python 3 development packages
+# The package currently depends on libpython3.3-dev, in the
+# future, dependencies on jython (Python for a JVM) and ironpython (Python
+# for Mono) may be added.
+# .
+# This package is a dependency package used as a build dependency for other
+# packages to avoid hardcoded dependencies on specific Python 3 development
+# packages.
+
+#Package: libpython3-all-dbg
+#Architecture: any
+#Multi-Arch: same
+#Section: debug
+#Priority: extra
+#Depends: libpython3-dbg (= ${binary:Version}), ${misc:Depends},
+# libpython3.3-dbg
+#Description: package depending on all supported Python 3 debugging packages
+# The package currently depends on libpython3.3-dbg, in the
+# future, dependencies on jython (Python for a JVM) and ironpython (Python
+# for Mono) may be added.
+# .
+# This package is a dependency package used as a build dependency for other
+# packages to avoid hardcoded dependencies on specific Python 3 debug packages.

=== modified file 'debian/control.in'
--- debian/control.in	2012-12-12 11:09:30 +0000
+++ debian/control.in	2013-01-24 11:51:20 +0000
@@ -9,6 +9,7 @@
 Homepage: http://www.python.org/
 Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python3-defaults-debian
 Vcs-Browser: http://alioth.debian.org/scm/loggerhead/pkg-python/python3-defaults-debian/files
+XS-Testsuite: autopkgtest
 
 Package: python3
 Architecture: any
@@ -169,3 +170,32 @@
  .
  This package is a dependency package used as a build dependency for other
  packages to avoid hardcoded dependencies on specific Python 3 debug packages.
+
+#Package: libpython3-all-dev
+#Architecture: any
+#Multi-Arch: same
+#Depends: libpython3-dev (= ${binary:Version}), ${misc:Depends},
+# libpython3.3-dev
+#Description: package depending on all supported Python 3 development packages
+# The package currently depends on libpython3.3-dev, in the
+# future, dependencies on jython (Python for a JVM) and ironpython (Python
+# for Mono) may be added.
+# .
+# This package is a dependency package used as a build dependency for other
+# packages to avoid hardcoded dependencies on specific Python 3 development
+# packages.
+
+#Package: libpython3-all-dbg
+#Architecture: any
+#Multi-Arch: same
+#Section: debug
+#Priority: extra
+#Depends: libpython3-dbg (= ${binary:Version}), ${misc:Depends},
+# libpython3.3-dbg
+#Description: package depending on all supported Python 3 debugging packages
+# The package currently depends on libpython3.3-dbg, in the
+# future, dependencies on jython (Python for a JVM) and ironpython (Python
+# for Mono) may be added.
+# .
+# This package is a dependency package used as a build dependency for other
+# packages to avoid hardcoded dependencies on specific Python 3 debug packages.

=== modified file 'debian/python3.manpages'
--- debian/python3.manpages	2011-04-14 21:44:29 +0000
+++ debian/python3.manpages	2013-01-24 11:51:20 +0000
@@ -1,3 +1,4 @@
 py3clean.1
 py3compile.1
 dh_python3.1
+pybuild.1

=== modified file 'debian/rules'
--- debian/rules	2012-12-12 10:45:17 +0000
+++ debian/rules	2013-01-24 11:51:20 +0000
@@ -6,8 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 changelog_values := $(shell dpkg-parsechangelog \
 			| awk '/^(Version|Source):/ {print $$2}')
@@ -382,6 +381,10 @@
 	  rm -rf debian/$$p/usr/share/doc/$$p; \
 	  ln -sf python3 debian/$$p/usr/share/doc/$$p; \
 	done
+#	rm -rf debian/libpython3-all-dev/usr/share/doc/libpython3-all-dev
+#	ln -sf libpython3-dev debian/libython3-all-dev/usr/share/doc/libpython3-all-dev
+#	rm -rf debian/libpython3-all-dbg/usr/share/doc/libpython3-all-dev
+#	ln -sf libpython3-dbg debian/libpython3-all-dbg/usr/share/doc/libpython3-all-dbg
 
 	dh_compress -a $(NOPKGS)
 	dh_fixperms -a $(NOPKGS)

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-01-24 11:51:20 +0000
@@ -0,0 +1,2 @@
+Tests: dh_python3
+Depends: python3-all-dev, debhelper, libjs-jquery

=== added file 'debian/tests/dh_python3'
--- debian/tests/dh_python3	1970-01-01 00:00:00 +0000
+++ debian/tests/dh_python3	2013-01-24 11:51:20 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -eu
+cp -r tests "$ADTTMP"
+cd "$ADTTMP/tests"
+sed -i "s/..\/..\/debian/\/usr\/share\/python3/g" common.mk
+for t in 1 2 3 4; do
+	sed -i "s/PYTHONPATH=..\/..\//PYTHONPATH=\/usr\/share\/python3/g" t$t/debian/rules
+	sed -i "s/..\/..\/debian\///g" t$t/debian/rules
+	sed -i "s/..\/..\///g" t$t/debian/rules
+	make test$t 2>&1
+done

=== modified file 'debpython/build/__init__.py'
--- debpython/build/__init__.py	2012-11-26 09:20:46 +0000
+++ debpython/build/__init__.py	2013-01-24 11:51:20 +0000
@@ -33,6 +33,6 @@
         plugins[i] = module.BuildSystem
     except Exception as err:
         if log.level < logging.WARN:
-            log.warn("cannot initialize '%s'", i, exc_info=True)
+            log.info("cannot initialize '%s'", i, exc_info=True)
         else:
-            log.warn("cannot initialize '%s': %s", i, err)
+            log.info("cannot initialize '%s': %s", i, err)

=== modified file 'debpython/build/base.py'
--- debpython/build/base.py	2012-12-12 10:45:17 +0000
+++ debpython/build/base.py	2013-01-24 11:51:20 +0000
@@ -19,11 +19,13 @@
 # THE SOFTWARE.
 
 import logging
+from functools import wraps
 from glob import glob1
 from os import remove, walk
-from os.path import exists, join
+from os.path import join
 from subprocess import Popen, PIPE
 from shutil import rmtree
+from debpython.tools import execute
 
 log = logging.getLogger('debpython')
 
@@ -80,7 +82,7 @@
         for tpl in self.REQUIRED_FILES:
             found = False
             for ftpl in tpl.split('|'):
-                res = glob1(self.cfg.dir, ftpl)
+                res = glob1(context['dir'], ftpl)
                 if res:
                     found = True
                     self.DETECTED_REQUIRED_FILES.setdefault(tpl, []).extend(res)
@@ -92,7 +94,7 @@
 
         self.DETECTED_OPTIONAL_FILES = {}
         for ftpl, score in self.OPTIONAL_FILES.items():
-            res = glob1(self.cfg.dir, ftpl)
+            res = glob1(context['dir'], ftpl)
             if res:
                 result += score
                 self.DETECTED_OPTIONAL_FILES.setdefault(ftpl, []).extend(res)
@@ -101,7 +103,7 @@
         return result
 
     def clean(self, context, args):
-        for root, dirs, file_names in walk(self.cfg.dir):
+        for root, dirs, file_names in walk(context['dir']):
             for name in dirs:
                 if name == '__pycache__':
                     dpath = join(root, name)
@@ -131,11 +133,24 @@
         raise NotImplementedError("build method not implemented in %s" % self.NAME)
 
     def test(self, context, args):
-        pass
+        if args['version'] == '2.7' or args['version'] >> '3.1':
+            return 'cd {build_dir}; {interpreter} -m unittest discover -v {args}'
+
+    def execute(self, context, args, command, log_file=None):
+        if log_file is False and self.cfg.really_quiet:
+            log_file = None
+        command = command.format(**args)
+        if 'PYTHONPATH' in args:
+            env = dict(context['ENV'])
+            env['PYTHONPATH'] = args['PYTHONPATH']
+        else:
+            env = context['ENV']
+        return execute(command, context['dir'], env, log_file)
 
 
 def shell_command(func):
 
+    @wraps(func)
     def wrapped_func(self, context, args, *oargs, **kwargs):
         command = kwargs.pop('command', None)
         if not command:
@@ -146,30 +161,19 @@
             log.warn('missing command (plugin=%s, method=%s, version=%s)',
                      self.NAME, func.__name__, args.get('version'))
             return command
-        command = command.format(**args)
-        log.debug('invoking: %s', command)
-
-        opath = join(args['home_dir'], '{}_cmd.log'.format(func.__name__))
-        i = 0
-        while exists(opath):
-            i += 1
-            opath = join(args['home_dir'], '{}_cmd_{}.log'.format(
-                func.__name__, i))
-
-        output = None
-        command_args = dict(shell=True, cwd=self.cfg.dir, env=context['ENV'])
+
         if self.cfg.quiet:
-            output = open(opath, 'w')
-            command_args.update(dict(stdout=output, stderr=output))
+            log_file = join(args['home_dir'], '{}_cmd.log'.format(func.__name__))
+        else:
+            log_file = False
 
-        with Popen(command, **command_args) as process:
-            stdout, stderr = process.communicate()
-            if process.returncode != 0:
-                msg = 'exit code={}: {}'.format(process.returncode, command)
-                if output:
-                    msg += '\nfull command log is available in {}'.format(opath)
-                raise Exception(msg)
+        command = command.format(**args)
+        output = self.execute(context, args, command, log_file)
+        if output['returncode'] != 0:
+            msg = 'exit code={}: {}'.format(output['returncode'], command)
+            if log_file:
+                msg += '\nfull command log is available in {}'.format(log_file)
+            raise Exception(msg)
         return True
 
-    wrapped_func.__name__ = func.__name__
     return wrapped_func

=== modified file 'debpython/build/plugin_distutils.py'
--- debpython/build/plugin_distutils.py	2012-12-12 10:45:17 +0000
+++ debpython/build/plugin_distutils.py	2013-01-24 11:51:20 +0000
@@ -48,8 +48,7 @@
                                '[install]\n',
                                'install-layout=deb\n',
                                'install-lib={}\n'.format(args['install_dir']),
-                               'root={}\n'.format(args['dest_dir']),
-                               'single-version-externally-managed=1\n',
+                               'root={}\n'.format(args['destdir']),
                                'skip-build=1\n'])
         context['ENV']['HOME'] = args['home_dir']
         return func(self, context, args, *oargs, **kwargs)
@@ -81,8 +80,8 @@
     @create_pydistutils_cfg
     def clean(self, context, args):
         super(BuildSystem, self).clean(context, args)
-        for fname in glob1(self.cfg.dir, '*.egg-info'):
-            fpath = join(self.cfg.dir, fname)
+        for fname in glob1(context['dir'], '*.egg-info'):
+            fpath = join(context['dir'], fname)
             rmtree(fpath) if isdir(fpath) else remove(fpath)
         return '{interpreter} {setup_py} clean {args}'
 
@@ -106,6 +105,7 @@
     def test(self, context, args):
         fpath = join(args['dir'], args['setup_py'])
         with open(fpath) as fp:
-            if fp.read().find('test_suite') > 0:  # TODO: is that enough to detect if test target is available?
+            if fp.read().find('test_suite') > 0:
+                # TODO: is that enough to detect if test target is available?
                 return '{interpreter} {setup_py} test {args}'
-        return super(BuildSystem, self).test(context, args)  # try nosetests if setup.py test is not available
+        return super(BuildSystem, self).test(context, args)

=== added file 'debpython/interpreter.py'
--- debpython/interpreter.py	1970-01-01 00:00:00 +0000
+++ debpython/interpreter.py	2013-01-24 11:51:20 +0000
@@ -0,0 +1,363 @@
+# Copyright © 2012 Piotr Ożarowski <[e-mail]>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+import logging
+import re
+from os.path import join, split
+from debpython.version import Version
+from debpython.tools import execute
+
+SHEBANG_RE = re.compile(r'''
+    (?:\#!\s*){0,1}  # shebang prefix
+    (?P<path>
+        .*?/bin/.*?)?
+    (?P<name>
+        python|pypy)
+    (?P<version>
+        \d[\.\d]*)?
+    (?P<debug>
+        -dbg)?
+    (?P<options>.*)
+    ''', re.VERBOSE)
+EXTFILE_RE = re.compile(r'''
+    (?P<name>.*?)
+    (?:\.
+        (?P<stableabi>abi\d+)
+     |(?:\.
+        (?P<soabi>
+            (?P<impl>cpython|pypy)
+            -
+            (?P<ver>\d{2})
+            (?P<flags>[a-z]*?)
+        )
+        (?:
+            -(?P<multiarch>[^/]*?)
+        )?
+    ))?
+    (?P<debug>_d)?
+    \.so$''', re.VERBOSE)
+log = logging.getLogger(__name__)
+
+
+class Interpreter:
+    path = None
+    name = 'python'
+    version = None
+    debug = False
+    impl = 'cpython'  # implementation
+    options = ()
+    _cache = {}
+
+    def __init__(self, value=None, path=None, name=None, version=None,
+                 debug=None, impl=None, options=None):
+        params = locals()
+        del params['self']
+        del params['value']
+
+        if isinstance(value, Interpreter):
+            for key in params.keys():
+                if params[key] is None:
+                    params[key] = getattr(value, key)
+        elif value:
+            if value.replace('.', '').isdigit() and not version:
+                params['version'] = Version(value)
+            else:
+                for key, val in self.parse(value).items():
+                    if params[key] is None:
+                        params[key] = val
+
+        for key, val in params.items():
+            setattr(self, key, val)
+
+    def __setattr__(self, name, value):
+        if name == 'name' and value:
+            if value.startswith('python'):
+                self.__dict__['impl'] = 'cpython'
+            elif value.startswith('pypy'):
+                self.__dict__['impl'] = 'pypy'
+            if '-dbg' in value:
+                self.__dict__['debug'] = True
+        elif name == 'version' and value is not None:
+            value = Version(value)
+        if name in ('name', 'impl', 'debug', 'options') and value is None:
+            # get the class default instead
+            self.__dict__[name] = getattr(Interpreter, name)
+        else:
+            self.__dict__[name] = value
+
+    def __repr__(self):
+        result = self.path or ''
+        result += self._vstr(self.version)
+        if self.options:
+            result += ' ' + ' '.join(self.options)
+        return result
+
+    def __str__(self):
+        return self._vstr(self.version)
+
+    def _vstr(self, version):
+        if self.impl == 'pypy':
+            # TODO: will Debian support more than one PyPy version?
+            return self.name
+        if version and str(version) not in self.name:
+            if self.debug:
+                return 'python{}-dbg'.format(version)
+            return self.name + str(version)
+        return self.name
+
+    @staticmethod
+    def parse(shebang):
+        """Return dict with parsed shebang
+
+        >>> sorted(Interpreter.parse('pypy').items())
+        [('debug', None), ('name', 'pypy'), ('options', ()), ('path', None), ('version', None)]
+        >>> sorted(Interpreter.parse('/usr/bin/python3.3-dbg').items())
+        [('debug', '-dbg'), ('name', 'python'), ('options', ()), ('path', '/usr/bin/'), ('version', '3.3')]
+        >>> sorted(Interpreter.parse('#! /usr/bin/pypy --foo').items())
+        [('debug', None), ('name', 'pypy'), ('options', ('--foo',)), ('path', '/usr/bin/'), ('version', None)]
+        >>> sorted(Interpreter.parse('#! /usr/bin/python3.2').items())
+        [('debug', None), ('name', 'python'), ('options', ()), ('path', '/usr/bin/'), ('version', '3.2')]
+        >>> sorted(Interpreter.parse('/usr/bin/python3.2-dbg --foo --bar').items())
+        [('debug', '-dbg'), ('name', 'python'), ('options', ('--foo', '--bar')),\
+ ('path', '/usr/bin/'), ('version', '3.2')]
+        """
+        result = SHEBANG_RE.search(shebang)
+        if not result:
+            return {}
+        result = result.groupdict()
+        if 'options' in result:
+            # TODO: do we need "--key value" here?
+            result['options'] = tuple(result['options'].split())
+        return result
+
+    def sitedir(self, gdb=False, package=None, version=None):
+        """Return path to site-packages directory.
+
+        Note that returned path is not the final location of .py files
+
+        >>> i = Interpreter('python')
+        >>> i.sitedir(version='3.1')
+        '/usr/lib/python3/dist-packages/'
+        >>> i.sitedir(version='2.5')
+        '/usr/lib/python2.5/site-packages/'
+        >>> i.sitedir(version=Version('2.7'))
+        '/usr/lib/python2.7/dist-packages/'
+        >>> i.sitedir(version='3.1', gdb=True, package='python3-foo')
+        'debian/python3-foo/usr/lib/debug/usr/lib/python3/dist-packages/'
+        >>> i.sitedir(version=Version('3.2'))
+        '/usr/lib/python3/dist-packages/'
+        >>> Interpreter('pypy').sitedir(version='2.0')
+        '/usr/lib/pypy/dist-packages/'
+        """
+        version = Version(version or self.version)
+        #if not version:
+        #    version = Version(DEFAULT)
+        if self.impl == 'pypy':
+            path = '/usr/lib/pypy/dist-packages/'
+        elif version << Version('2.6'):
+            path = "/usr/lib/python%s/site-packages/" % version
+        elif version << Version('3.0'):
+            path = "/usr/lib/python%s/dist-packages/" % version
+        else:
+            path = '/usr/lib/python3/dist-packages/'
+
+        if gdb:
+            path = "/usr/lib/debug%s" % path
+        if package:
+            path = "debian/%s%s" % (package, path)
+
+        return path
+
+    def cache_file(self, fpath, version=None):
+        """Given path to a .py file, return path to its .pyc/.pyo file.
+
+        This function is inspired by Python 3.2's imp.cache_from_source.
+
+        :param fpath: path to file name
+        :param version: Python version
+
+        >>> i = Interpreter('python')
+        >>> i.cache_file('foo.py', Version('3.1'))
+        'foo.pyc'
+        >>> i.cache_file('bar/foo.py', '3.2')
+        'bar/__pycache__/foo.cpython-32.pyc'
+        """
+        version = Version(version or self.version)
+        last_char = 'o' if '-O' in self.options else 'c'
+        if version <= Version('3.1'):
+            return fpath + last_char
+
+        fdir, fname = split(fpath)
+        if not fname.endswith('.py'):
+            fname += '.py'
+        return join(fdir, '__pycache__', "%s.%s.py%s" %
+                    (fname[:-3], self.magic_tag(version), last_char))
+
+    def ext_file(self, name, version=None):
+        """Return extension name with soname and multiarch tags."""
+        version = Version(version or self.version)
+        soabi, multiarch = self._get_config(version)
+        result = name.split('.', 1)[0]
+        if soabi:
+            result += '.{}'.format(soabi)
+            if multiarch:
+                result += '-{}'.format(multiarch)
+        if self.debug and self.impl == 'cpython'\
+                and version << Version('3'):
+            result += '_d'
+        return '{}.so'.format(result)
+
+    def magic_number(self, version=None):
+        """Return magic number."""
+        version = Version(version or self.version)
+        if self.impl == 'cpython' and version << Version('3'):
+            return ''
+        result = self._execute('import imp; print(imp.get_magic())', version)
+        return eval(result)
+
+    def magic_tag(self, version=None):
+        """Return Python magic tag (used in __pycache__ dir to tag files).
+
+        >>> i = Interpreter('python')
+        >>> i.magic_tag(version='3.2')
+        'cpython-32'
+        """
+        version = Version(version or self.version)
+        if self.impl == 'cpython' and version << Version('3.2'):
+            return ''
+        return self._execute('import imp; print(imp.get_tag())', version)
+
+    def multiarch(self, version=None):
+        """Return multiarch tag."""
+        version = Version(version or self.version)
+        try:
+            soabi, multiarch = self._get_config(version)
+        except Exception:
+            log.debug('cannot get multiarch', exc_info=True)
+            # interpreter without multiach support
+            return ''
+        return multiarch
+
+    def stableabi(self, version=None):
+        version = Version(version or self.version)
+        # stable ABI was introduced in Python 3.3
+        if self.impl == 'cpython' and version >> Version('3.2'):
+            return 'abi{}'.format(version.major)
+
+    def soabi(self, version=None):
+        """Return SOABI flag (used to in .so files).
+
+        >>> i = Interpreter('python')
+        >>> i.soabi(version=Version('3.3'))
+        'cpython-33m'
+        """
+        version = Version(version or self.version)
+        # NOTE: it's not the same as magic_tag
+        try:
+            soabi, multiarch = self._get_config(version)
+        except Exception:
+            log.debug('cannot get soabi', exc_info=True)
+            # interpreter without soabi support
+            return ''
+        return soabi
+
+    def check_extname(self, fname, version=None):
+        """Return extension file name if file can be renamed.
+
+        >>> i = Interpreter('python')
+        >>> i.check_extname('foo.so', version='3.3') # doctest: +ELLIPSIS
+        'foo.cpython-33m-....so'
+        >>> i.check_extname('foo.abi3.so', version='3.3')
+        >>> i.check_extname('foo/bar/bazmodule.so', version='3.3') # doctest: +ELLIPSIS
+        'foo/bar/baz.cpython-33m-....so'
+        """
+        version = Version(version or self.version)
+
+        if '/' in fname:
+            fdir, fname = fname.rsplit('/', 1)  # in case full path was passed
+        else:
+            fdir = ''
+
+        info = EXTFILE_RE.search(fname)
+        if not info:
+            return
+        info = info.groupdict()
+
+        if info['stableabi']:
+            # files with stable ABI in name don't need changes
+            return
+
+        i = Interpreter(self, version=version)
+        if info['ver']:
+            i.version = "{}.{}".format(info['ver'][0], info['ver'][1])
+        if not i.debug and (info['debug'] or 'd' in (info['flags'] or '')):
+            i.debug = True
+        try:
+            soabi, multiarch = i._get_config()
+        except Exception:
+            log.debug('cannot get soabi/multiarch', exc_info=True)
+            return
+        result = info['name']
+        if i.impl == 'cpython' and i.version >> '3.2' and result.endswith('module'):
+            result = result[:-6]
+        if info['soabi'] or soabi:
+            result = "{}.{}".format(result, info['soabi'] or soabi)
+            if info['multiarch'] or multiarch:
+                result = "{}-{}".format(result, info['multiarch'] or multiarch)
+
+        result += '.so'
+        if fname == result:
+            return
+        return join(fdir, result)
+
+    def _get_config(self, version=None):
+        version = Version(version or self.version)
+        # sysconfig module is available since Python 3.2
+        # (also backported to Python 2.7)
+        if self.impl == 'pypy' or self.impl == 'cpython' and (
+                version >> '2.6' and version << '3'
+                or version >> '3.1' or version == '3'):
+            cmd = 'import sysconfig as s;'
+        else:
+            cmd = 'from distutils import sysconfig as s;'
+        cmd += 'print("__SEP__".join(i or "" ' \
+               'for i in s.get_config_vars("SOABI", "MULTIARCH")))'
+        return self._execute(cmd, version).split('__SEP__')
+
+    def _execute(self, command, version=None, cache=True):
+        version = Version(version or self.version)
+        command = "{} -c '{}'".format(self._vstr(version), command.replace("'", "\'"))
+        if cache and command in self.__class__._cache:
+            return self.__class__._cache[command]
+
+        output = execute(command)
+        if output['returncode'] != 0:
+            log.debug(output['stderr'])
+            raise Exception('{} failed with status code {}'.format(command, output['returncode']))
+
+        result = output['stdout'].splitlines()
+
+        if len(result) == 1:
+            result = result[0]
+
+        if cache:
+            self.__class__._cache[command] = result
+
+        return result

=== removed file 'debpython/interpreter.py'
--- debpython/interpreter.py	2012-12-14 22:05:46 +0000
+++ debpython/interpreter.py	1970-01-01 00:00:00 +0000
@@ -1,360 +0,0 @@
-# Copyright © 2012 Piotr Ożarowski <[e-mail]>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-import logging
-import re
-from os.path import join, split
-from subprocess import PIPE, Popen
-from debpython.version import Version
-
-SHEBANG_RE = re.compile(r'''
-    (?:\#!\s*){0,1}  # shebang prefix
-    (?P<path>
-        .*?/bin/.*?)?
-    (?P<name>
-        python|pypy)
-    (?P<version>
-        \d[\.\d]*)?
-    (?P<debug>
-        -dbg)?
-    (?P<options>.*)
-    ''', re.VERBOSE)
-EXTFILE_RE = re.compile(r'''
-    (?P<name>.*?)
-    (?:\.
-        (?P<stableabi>abi\d+)
-     |(?:\.
-        (?P<soabi>
-            (?P<impl>cpython|pypy)
-            -
-            (?P<ver>\d{2})
-            (?P<flags>[a-z]*?)
-        )
-        (?:
-            -(?P<multiarch>[^/]*?)
-        )?
-    ))?
-    (?P<debug>_d)?
-    \.so$''', re.VERBOSE)
-log = logging.getLogger(__name__)
-
-
-class Interpreter:
-    path = None
-    name = 'python'
-    version = None
-    debug = False
-    impl = 'cpython'  # implementation
-    options = ()
-    _cache = {}
-
-    def __init__(self, value=None, path=None, name=None, version=None,
-                 debug=None, impl=None, options=None):
-        params = locals()
-        del params['self']
-        del params['value']
-
-        if isinstance(value, Interpreter):
-            for key in params.keys():
-                if params[key] is None:
-                    params[key] = getattr(value, key)
-        elif value:
-            if value.replace('.', '').isdigit() and not version:
-                params['version'] = Version(value)
-            else:
-                for key, val in self.parse(value).items():
-                    if params[key] is None:
-                        params[key] = val
-
-        for key, val in params.items():
-            setattr(self, key, val)
-
-    def __setattr__(self, name, value):
-        if name == 'name' and value:
-            if value.startswith('python'):
-                self.__dict__['impl'] = 'cpython'
-            elif value.startswith('pypy'):
-                self.__dict__['impl'] = 'pypy'
-            if '-dbg' in value:
-                self.__dict__['debug'] = True
-        elif name == 'version' and value is not None:
-            value = Version(value)
-        if name in ('name', 'impl', 'debug', 'options') and value is None:
-            # get the class default instead
-            self.__dict__[name] = getattr(Interpreter, name)
-        else:
-            self.__dict__[name] = value
-
-    def __repr__(self):
-        result = self.path or ''
-        result += self._vstr(self.version)
-        if self.options:
-            result += ' ' + ' '.join(self.options)
-        return result
-
-    def __str__(self):
-        return self._vstr(self.version)
-
-    def _vstr(self, version):
-        if self.impl == 'pypy':
-            # TODO: will Debian support more than one PyPy version?
-            return self.name
-        if version and str(version) not in self.name:
-            if self.debug:
-                return 'python{}-dbg'.format(version)
-            return self.name + str(version)
-        return self.name
-
-    @staticmethod
-    def parse(shebang):
-        """Return dict with parsed shebang
-
-        >>> sorted(Interpreter.parse('pypy').items())
-        [('debug', None), ('name', 'pypy'), ('options', ()), ('path', None), ('version', None)]
-        >>> sorted(Interpreter.parse('/usr/bin/python3.3-dbg').items())
-        [('debug', '-dbg'), ('name', 'python'), ('options', ()), ('path', '/usr/bin/'), ('version', '3.3')]
-        >>> sorted(Interpreter.parse('#! /usr/bin/pypy --foo').items())
-        [('debug', None), ('name', 'pypy'), ('options', ('--foo',)), ('path', '/usr/bin/'), ('version', None)]
-        >>> sorted(Interpreter.parse('#! /usr/bin/python3.2').items())
-        [('debug', None), ('name', 'python'), ('options', ()), ('path', '/usr/bin/'), ('version', '3.2')]
-        >>> sorted(Interpreter.parse('/usr/bin/python3.2-dbg --foo --bar').items())
-        [('debug', '-dbg'), ('name', 'python'), ('options', ('--foo', '--bar')),\
- ('path', '/usr/bin/'), ('version', '3.2')]
-        """
-        result = SHEBANG_RE.search(shebang)
-        if not result:
-            return {}
-        result = result.groupdict()
-        if 'options' in result:
-            # TODO: do we need "--key value" here?
-            result['options'] = tuple(result['options'].split())
-        return result
-
-    def sitedir(self, gdb=False, package=None, version=None):
-        """Return path to site-packages directory.
-
-        Note that returned path is not the final location of .py files
-
-        >>> i = Interpreter('python')
-        >>> i.sitedir(version='3.1')
-        '/usr/lib/python3/dist-packages/'
-        >>> i.sitedir(version='2.5')
-        '/usr/lib/python2.5/site-packages/'
-        >>> i.sitedir(version=Version('2.7'))
-        '/usr/lib/python2.7/dist-packages/'
-        >>> i.sitedir(version='3.1', gdb=True, package='python3-foo')
-        'debian/python3-foo/usr/lib/debug/usr/lib/python3/dist-packages/'
-        >>> i.sitedir(version=Version('3.2'))
-        '/usr/lib/python3/dist-packages/'
-        """
-        version = Version(version or self.version)
-        #if not version:
-        #    version = Version(DEFAULT)
-
-        if version << Version('2.6'):
-            path = "/usr/lib/python%s/site-packages/" % version
-        elif version << Version('3.0'):
-            path = "/usr/lib/python%s/dist-packages/" % version
-        else:
-            path = '/usr/lib/python3/dist-packages/'
-
-        if gdb:
-            path = "/usr/lib/debug%s" % path
-        if package:
-            path = "debian/%s%s" % (package, path)
-
-        return path
-
-    def cache_file(self, fpath, version=None):
-        """Given path to a .py file, return path to its .pyc/.pyo file.
-
-        This function is inspired by Python 3.2's imp.cache_from_source.
-
-        :param fpath: path to file name
-        :param version: Python version
-
-        >>> i = Interpreter('python')
-        >>> i.cache_file('foo.py', Version('3.1'))
-        'foo.pyc'
-        >>> i.cache_file('bar/foo.py', '3.2')
-        'bar/__pycache__/foo.cpython-32.pyc'
-        """
-        version = Version(version or self.version)
-        last_char = 'o' if '-O' in self.options else 'c'
-        if version <= Version('3.1'):
-            return fpath + last_char
-
-        fdir, fname = split(fpath)
-        if not fname.endswith('.py'):
-            fname += '.py'
-        return join(fdir, '__pycache__', "%s.%s.py%s" %
-                    (fname[:-3], self.magic_tag(version), last_char))
-
-    def ext_file(self, name, version=None):
-        """Return extension name with soname and multiarch tags."""
-        version = Version(version or self.version)
-        soabi, multiarch = self._get_config(version)
-        result = name.split('.', 1)[0]
-        if soabi:
-            result += '.{}'.format(soabi)
-            if multiarch:
-                result += '-{}'.format(multiarch)
-        if self.debug and self.impl == 'cpython'\
-                and version << Version('3'):
-            result += '_d'
-        return '{}.so'.format(result)
-
-    def magic_number(self, version=None):
-        """Return magic number."""
-        version = Version(version or self.version)
-        if self.impl == 'cpython' and version << Version('3'):
-            return ''
-        result = self._call('import imp; print(imp.get_magic())', version)
-        return eval(result)
-
-    def magic_tag(self, version=None):
-        """Return Python magic tag (used in __pycache__ dir to tag files).
-
-        >>> i = Interpreter('python')
-        >>> i.magic_tag(version='3.2')
-        'cpython-32'
-        """
-        version = Version(version or self.version)
-        if self.impl == 'cpython' and version << Version('3.2'):
-            return ''
-        return self._call('import imp; print(imp.get_tag())', version)
-
-    def multiarch(self, version=None):
-        """Return multiarch tag."""
-        version = Version(version or self.version)
-        try:
-            soabi, multiarch = self._get_config(version)
-        except Exception:
-            # interpreter without multiach support
-            return ''
-        return multiarch
-
-    def stableabi(self, version=None):
-        version = Version(version or self.version)
-        # stable ABI was introduced in Python 3.3
-        if self.impl == 'cpython' and version >> Version('3.2'):
-            return 'abi{}'.format(version.major)
-
-    def soabi(self, version=None):
-        """Return SOABI flag (used to in .so files).
-
-        >>> i = Interpreter('python')
-        >>> i.soabi(version=Version('3.3'))
-        'cpython-33m'
-        """
-        version = Version(version or self.version)
-        # NOTE: it's not the same as magic_tag
-        try:
-            soabi, multiarch = self._get_config(version)
-        except Exception:
-            # interpreter without soabi support
-            return ''
-        return soabi
-
-    def check_extname(self, fname, version=None):
-        """Return extension file name if file can be renamed.
-
-        >>> i = Interpreter('python')
-        >>> i.check_extname('foo.so', version='3.3')
-        'foo.cpython-33m-x86_64-linux-gnu.so'
-        >>> i.check_extname('foo.abi3.so', version='3.3')
-        >>> i.check_extname('foo/bar/bazmodule.so', version='3.3')
-        'foo/bar/baz.cpython-33m-x86_64-linux-gnu.so'
-        """
-        version = Version(version or self.version)
-
-        if '/' in fname:
-            fdir, fname = fname.rsplit('/', 1)  # in case full path was passed
-        else:
-            fdir = ''
-
-        info = EXTFILE_RE.search(fname)
-        if not info:
-            return
-        info = info.groupdict()
-
-        if info['stableabi']:
-            # files with stable ABI in name don't need changes
-            return
-
-        i = Interpreter(self, version=version)
-        if info['ver']:
-            i.version = "{}.{}".format(info['ver'][0], info['ver'][1])
-        if not i.debug and (info['debug'] or 'd' in (info['flags'] or '')):
-            i.debug = True
-        try:
-            soabi, multiarch = i._get_config()
-        except Exception:
-            return
-        result = info['name']
-        if i.impl == 'cpython' and i.version >> '3.2' and result.endswith('module'):
-            result = result[:-6]
-        if info['soabi'] or soabi:
-            result = "{}.{}".format(result, info['soabi'] or soabi)
-            if info['multiarch'] or multiarch:
-                result = "{}-{}".format(result, info['multiarch'] or multiarch)
-
-        result += '.so'
-        if fname == result:
-            return
-        return join(fdir, result)
-
-    def _get_config(self, version=None):
-        version = Version(version or self.version)
-        # sysconfig module is available since Python 3.2
-        # (also backported to Python 2.7)
-        if self.impl == 'pypy' or self.impl == 'cpython' and (
-                version >> '2.6' and version << '3'
-                or version >> '3.1' or version == '3'):
-            cmd = 'import sysconfig as s;'
-        else:
-            cmd = 'from distutils import sysconfig as s;'
-        cmd += 'print("__SEP__".join(i or "" ' \
-               'for i in s.get_config_vars("SOABI", "MULTIARCH")))'
-        return self._call(cmd, version).split('__SEP__')
-
-    def _call(self, command, version=None, cache=True):
-        version = Version(version or self.version)
-        command = "{} -c '{}'".format(self._vstr(version), command.replace("'", "\'"))
-        if cache and command in self.__class__._cache:
-            return self.__class__._cache[command]
-
-        log.debug("invoking %s", command)
-        p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
-        status = p.wait()
-        if status != 0:
-            log.debug(p.stderr.read())
-            raise Exception('{} failed with status code {}'.format(command, status))
-        result = []
-        for line in p.stdout:
-            result.append(str(line, 'utf-8').rstrip('\r\n'))
-
-        if len(result) == 1:
-            result = result[0]
-
-        if cache:
-            self.__class__._cache[command] = result
-
-        return result

=== modified file 'debpython/tools.py'
--- debpython/tools.py	2012-12-12 10:45:17 +0000
+++ debpython/tools.py	2013-01-24 11:51:20 +0000
@@ -22,8 +22,10 @@
 import logging
 import os
 import re
+from datetime import datetime
 from pickle import dumps
 from os.path import isdir, islink, join, split
+from subprocess import Popen, PIPE
 from debpython.version import getver
 
 log = logging.getLogger(__name__)
@@ -64,6 +66,22 @@
         os.rename(fpath, dstdir)
 
 
+def move_matching_files(src, dst, pattern):
+    """Move files (preserving path) that match given pattern.
+
+    move_files('foo/bar/', 'foo/baz/', 'spam/.*\.so$')
+    will move foo/bar/a/b/c/spam/file.so to foo/baz/a/b/c/spam/file.so
+    """
+    match = re.compile(pattern).search
+    for root, dirs, filenames in os.walk(src):
+        for fn in filenames:
+            spath = join(root, fn)
+            if match(spath):
+                dpath = join(dst, spath.lstrip(src).lstrip('/'))
+                os.renames(spath, dpath)
+
+
+
 def fix_shebang(fpath, replacement=None):
     """Normalize file's shebang.
 
@@ -140,6 +158,40 @@
     return name
 
 
+def execute(command, cwd=None, env=None, log_output=None):
+    """Execute external shell commad.
+
+    :param cdw: currennt working directory
+    :param env: environment
+    :param log_output:
+        * opened log file or path to this file, or
+        * None if output should be included in the returned dict, or
+        * False if output should be redirectored to stdout/stderr
+    """
+    args = {'shell': True, 'cwd': cwd, 'env': env}
+    close = False
+    if log_output is False:
+        pass
+    elif log_output is None:
+        args.update(stdout=PIPE, stderr=PIPE)
+    elif log_output:
+        if isinstance(log_output, str):
+            close = True
+            log_output = open(log_output, 'a')
+        log_output.write('\n# command executed on {}'.format(datetime.now().isoformat()))
+        log_output.write('\n$ {}\n'.format(command))
+        log_output.flush()
+        args.update(stdout=log_output, stderr=log_output)
+
+    log.debug('invoking: %s', command)
+    with Popen(command, **args) as process:
+        stdout, stderr = process.communicate()
+        close and log_output.close()
+        return dict(returncode=process.returncode,
+                    stdout=stdout and str(stdout, 'utf-8'),
+                    stderr=stderr and str(stderr, 'utf-8'))
+
+
 class memoize:
     def __init__(self, func):
         self.func = func

=== modified file 'debpython/version.py'
--- debpython/version.py	2012-12-12 10:45:17 +0000
+++ debpython/version.py	2013-01-24 11:51:20 +0000
@@ -100,6 +100,9 @@
             result += '.{}'.format(self.minor)
         return result
 
+    def __hash__(self):
+        return hash(repr(self))
+
     def __repr__(self):
         """Return full version string.
 
@@ -248,7 +251,7 @@
     :type available: bool
 
     >>> sorted(get_requested_versions([(3, 0), None]))
-    [(3, 2)]
+    [(3, 2), (3, 3)]
     >>> sorted(get_requested_versions('')) == sorted(SUPPORTED)
     True
     >>> sorted(get_requested_versions([None, None])) == sorted(SUPPORTED)

=== added directory 'dh'
=== added file 'dh/pybuild.pm'
--- dh/pybuild.pm	1970-01-01 00:00:00 +0000
+++ dh/pybuild.pm	2013-01-24 11:51:20 +0000
@@ -0,0 +1,172 @@
+# A debhelper build system class for building Python libraries
+#
+# Copyright: © 2012-2013 Piotr Ożarowski
+# License: GPL-2+
+
+# TODO:
+# * save check_auto_buildable's result and pass it later via --system to speed things up
+# * support for dh --parallel
+
+package Debian::Debhelper::Buildsystem::pybuild;
+
+use strict;
+use Cwd ();
+use Debian::Debhelper::Dh_Lib qw(error);
+use base 'Debian::Debhelper::Buildsystem';
+
+sub DESCRIPTION {
+	"Python pybuild"
+}
+
+sub check_auto_buildable {
+	my $this=shift;
+	return $this->doit_in_sourcedir('pybuild', '--detect', '--really-quiet');
+}
+
+sub new {
+	my $class=shift;
+	my $this=$class->SUPER::new(@_);
+	$this->enforce_in_source_building();
+
+	if (!$ENV{'PYBUILD_INTERPRETERS'}) {
+		$this->{pydef} = `pyversions -vd 2>/dev/null`;
+		$this->{pydef} =~ s/\s+$//;
+		$this->{pyvers} = `pyversions -vr 2>/dev/null`;
+		$this->{pyvers} =~ s/\s+$//;
+		$this->{py3def} = `py3versions -vd 2>/dev/null`;
+		$this->{py3def} =~ s/\s+$//;
+		$this->{py3vers} = `py3versions -vr 2>/dev/null`;
+		$this->{py3vers} =~ s/\s+$//;
+		$this->{pypydef} = `pypy -c 'from sys import pypy_version_info as i; print("%s.%s" % (i.major, i.minor))' 2>/dev/null`;
+		$this->{pypydef} =~ s/\s+$//;
+	}
+
+	return $this;
+}
+
+sub configure {
+	my $this=shift;
+	foreach my $command ($this->pybuild_commands('configure', @_)) {
+		$this->doit_in_sourcedir($command);
+	}
+}
+
+sub build {
+	my $this=shift;
+	foreach my $command ($this->pybuild_commands('build', @_)) {
+		$this->doit_in_sourcedir($command);
+	}
+}
+
+sub install {
+	my $this=shift;
+	my $destdir=shift;
+	foreach my $command ($this->pybuild_commands('install', @_)) {
+		$this->doit_in_sourcedir("$command --dest-dir '$destdir'");
+	}
+}
+
+sub test {
+	my $this=shift;
+	foreach my $command ($this->pybuild_commands('test', @_)) {
+		$this->doit_in_sourcedir($command);
+	}
+}
+
+sub clean {
+	my $this=shift;
+	foreach my $command ($this->pybuild_commands('clean', @_)) {
+		$this->doit_in_sourcedir($command);
+	}
+	$this->doit_in_sourcedir('rm', '-rf', '.pybuild/');
+}
+
+sub pybuild_commands {
+	my $this=shift;
+	my $step=shift;
+	my @options = @_;
+	my @result;
+
+	if ($ENV{'PYBUILD_INTERPRETERS'}) {
+		push @result, "pybuild --$step @options";
+	}
+	else {
+		# get interpreter packages from Build-Depends{,-Indep}:
+		# NOTE: possible problems with alternative/versioned dependencies
+		my @deps = $this->python_build_dependencies();
+
+		my $pyall = 0;
+		my $pyalldbg = 0;
+		my $py3all = 0;
+		my $py3alldbg = 0;
+
+		my $i = 'python{version}';
+
+		# Python
+		if ($this->{pyvers}) {
+			if (grep {$_ eq 'python-all' or $_ eq 'python-all-dev'} @deps) {
+				$pyall = 1;
+				push @result, "pybuild --$step -i $i -p '$this->{pyvers}' @options";
+			}
+			if (grep {$_ eq 'python-all-dbg'} @deps) {
+				$pyalldbg = 1;
+				push @result, "pybuild --$step -i $i-dbg -p '$this->{pyvers}' @options";
+			}
+		}
+		if ($this->{pydef}) {
+			if (not $pyall and grep {$_ eq 'python' or $_ eq 'python-dev'} @deps) {
+				push @result, "pybuild --$step -i $i -p '$this->{pydef}' @options";
+			}
+			if (not $pyalldbg and grep {$_ eq 'python-dbg'} @deps) {
+				push @result, "pybuild --$step -i $i-dbg -p '$this->{pydef}' @options";
+			}
+		}
+
+		# Python 3
+		if ($this->{py3vers}) {
+			my $i = 'python{version}';
+			if (grep {$_ eq 'python3-all' or $_ eq 'python3-all-dev'} @deps) {
+				$py3all = 1;
+				push @result, "pybuild --$step -i $i -p '$this->{py3vers}' @options";
+			}
+			if (grep {$_ eq 'python3-all-dbg'} @deps) {
+				$py3alldbg = 1;
+				push @result, "pybuild --$step -i $i-dbg -p'$this->{py3vers}' @options";
+			}
+		}
+		if ($this->{py3def}) {
+			if (not $pyall and grep {$_ eq 'python3' or $_ eq 'python3-dev'} @deps) {
+ 				# TODO: "python3" case: should X-Python3-Version header in debian/control be also required here?
+				push @result, "pybuild --$step -i $i -p '$this->{py3def}' @options";
+			}
+			if (not $pyalldbg and grep {$_ eq 'python3-dbg'} @deps) {
+				push @result, "pybuild --$step -i $i-dbg -p '$this->{py3def}' @options";
+			}
+		}
+		# TODO: pythonX.Y → `pybuild -i python{version} -p X.Y`
+
+		# PyPy
+		if ($this->{pypydef} and grep {$_ eq 'pypy'} @deps) {
+			push @result, "pybuild --$step -i pypy -p '$this->{pypydef}' @options";
+		}
+	}
+	return @result;
+}
+
+sub python_build_dependencies {
+	my $this=shift;
+
+	my @result;
+	open (CONTROL, 'debian/control') || error("cannot read debian/control: $!\n");
+	foreach my $builddeps (join('', <CONTROL>) =~ 
+			/^Build-Depends[^:]*:.*\n(?:^[^\w\n#].*\n)*/gmi) {
+		while ($builddeps =~ /[\s,](pypy|python[0-9\.]*(-all)?((-dev)|(-dbg))?)[\s,]|$/g) {
+			if ($1) {push @result, $1};
+		}
+	}
+
+	close CONTROL;
+	return @result;
+}
+
+1

=== renamed file 'python3.pm' => 'dh/python3.pm'
=== modified file 'dh_python3'
--- dh_python3	2012-12-12 10:45:17 +0000
+++ dh_python3	2013-01-24 11:51:20 +0000
@@ -450,7 +450,10 @@
 
         pyclean_added = False  # invoke pyclean only once in maintainer script
         if stats['compile']:
-            dh.autoscript(package, 'postinst', 'postinst-py3compile', '')
+            args = ''
+            if options.vrange and options.vrange != (None, None):
+                args += "-V %s" % vrange_str(options.vrange)
+            dh.autoscript(package, 'postinst', 'postinst-py3compile', args)
             dh.autoscript(package, 'prerm', 'prerm-py3clean', '')
             pyclean_added = True
         for pdir, details in stats['private_dirs'].items():

=== modified file 'dh_python3.rst'
--- dh_python3.rst	2012-11-26 09:20:46 +0000
+++ dh_python3.rst	2013-01-24 11:51:20 +0000
@@ -129,3 +129,4 @@
 * /usr/share/doc/python3-doc/README.PyDist (python3-doc package)
 * py3compile(1), py3clean(1)
 * dh_python2(1), pycompile(1), pyclean(1)
+* http://deb.li/dhp3 - most recent version of this document

=== modified file 'pybuild' (properties changed: +x to -x)
--- pybuild	2012-12-12 10:45:17 +0000
+++ pybuild	2013-01-24 11:51:20 +0000
@@ -38,7 +38,8 @@
     except ImportError:
         sys.path.append('/usr/share/python3/')
         from debpython import build  # NOQA
-    from debpython.version import debsorted, get_requested_versions, vrepr
+    from debpython.version import Version, debsorted, get_requested_versions
+    from debpython.tools import execute, move_matching_files
 
     if cfg.list_systems:
         for name, Plugin in sorted(build.plugins.items()):
@@ -52,6 +53,7 @@
             log.error('unrecognized build system: %s', cfg.system)
             exit(10)
         plugin = Plugin(cfg)
+        context = {'ENV': environ.copy(), 'args': {}, 'dir': cfg.dir}
     else:
         plugin, certainty, context = None, 0, None
         for Plugin in build.plugins.values():
@@ -61,7 +63,7 @@
                 log.warn('cannot initialize %s plugin: %s', Plugin.NAME,
                          err, exc_info=cfg.verbose)
                 continue
-            tmp_context = {'ENV': environ.copy(), 'args': {}}
+            tmp_context = {'ENV': environ.copy(), 'args': {}, 'dir': cfg.dir}
             tmp_context['ENV'].update({'LC_ALL': 'C',
                                        'http_proxy': 'http://127.0.0.1:9/'})
             tmp_certainty = tmp_plugin.detect(tmp_context)
@@ -69,7 +71,8 @@
                 plugin, certainty, context = tmp_plugin, tmp_certainty, tmp_context
         del Plugin
         if not plugin:
-            log.error('cannot detect build system')
+            log.error('cannot detect build system, please use --system option'
+                      ' or set PYBUILD_SYSTEM env. variable')
             exit(11)
     for interpreter in cfg.interpreter:
         if plugin.SUPPORTED_INTERPRETERS is not True and interpreter not in plugin.SUPPORTED_INTERPRETERS:
@@ -83,41 +86,122 @@
         exit(0)
 
     # reversed so that default Python version will be last
-    versions = cfg.versions  # TODO: default should be last
+    versions = cfg.versions
     if not versions:
         versions = list(reversed(debsorted(get_requested_versions(available=True))))
-    # TODO: defalt interpreter{version} → interpreter
+    versions = [Version(v) for v in versions]
+
+    def get_option(name, interpreter=None, version=None, default=None):
+        if interpreter:
+            # try PYBUILD_NAME_python3.3-dbg (or hardcoded interpreter)
+            i = interpreter.format(version=version or '')
+            opt = "PYBUILD_{}_{}".format(name.upper(), i)
+            if opt in environ:
+                return environ[opt]
+            # try PYBUILD_NAME_python3-dbg (if not checked above)
+            if '{version}' in interpreter and version:
+                i = interpreter.format(version=version.major)
+                opt = "PYBUILD_{}_{}".format(name.upper(), i)
+                if opt in environ:
+                    return environ[opt]
+        # try PYBUILD_NAME
+        opt = "PYBUILD_{}".format(name.upper())
+        if opt in environ:
+            return environ[opt]
+        # try command line args
+        return getattr(cfg, name, default) or default
 
     def get_args(context, step, version, interpreter):
-        v = vrepr(version)
-        i = interpreter.format(version=v)
-        home_dir = '.pybuild/{}_{}'.format(interpreter.format(version='X.Y'), v)
-        build_dir = join(home_dir, 'build')
+        i = interpreter.format(version=version)
+        home_dir = '.pybuild/{}_{}'.format(interpreter.format(version='X.Y'), version)
+        build_dir = get_option('build_dir', interpreter, version,
+                               default=join(home_dir, 'build'))
         args = dict(context['args'])
         args.update({
             'interpreter': i,
-            'args': getattr(cfg, "%s_args" % step),
-            'dir': cfg.dir.format(version=v),
-            'dest_dir': (join(cfg.dir, cfg.dest_dir)).format(
-                version=v, interpreter=i),
-            'home_dir': (join(cfg.dir, home_dir)).format(
-                version=v, interpreter=i),
-            'build_dir': (join(cfg.dir, build_dir)).format(
-                version=v, interpreter=i),
-            'install_dir': cfg.install_dir.format(
-                version=v, interpreter=i),
-            'version': v})
+            'args': get_option("%s_args" % step, interpreter, version, ''),
+            'dir': context['dir'].format(version=version, interpreter=i),
+            'destdir': (join(context['dir'], context['destdir'])).format(
+                version=version, interpreter=i),
+            'home_dir': (join(context['dir'], home_dir)).format(
+                version=version, interpreter=i),
+            'build_dir': (join(context['dir'], build_dir)).format(
+                version=version, interpreter=i),
+            # versioned dist-packages even for Python 3.X - dh_python3 will fix it later
+            # (and will have a chance to compare files)
+            'install_dir': get_option('install_dir', interpreter, version,
+                                      '/usr/lib/python{version}/dist-packages'
+                                      ).format(version=version, interpreter=i),
+            'version': version})
+        if interpreter == 'pypy':
+            args['install_dir'] = '/usr/lib/pypy/dist-packages/'
         if step == 'test':
-            args['test_dir'] = join(args['dest_dir'], args['install_dir'].lstrip('/'))
             pp = context['ENV'].get('PYTHONPATH', '')
+            args['test_dir'] = join(args['destdir'], args['install_dir'].lstrip('/'))
             if args['test_dir'] not in pp.split(':'):
-                context['ENV']['PYTHONPATH'] = "{}:{}".format(pp, args['test_dir']).lstrip(':')
+                pp = "{}:{}".format(pp, args['test_dir']).lstrip(':')
+            if args['build_dir'] not in pp.split(':'):
+                pp = "{}:{}".format(pp, args['build_dir']).lstrip(':')
+            args['PYTHONPATH'] = pp
 
         if not exists(args['build_dir']):
             makedirs(args['build_dir'])
 
         return args
 
+    def is_disabled(step, interpreter, version):
+        i = interpreter
+        prefix = "{}/".format(step)
+        disabled = (get_option('disable', i, version) or '').split()
+        for item in disabled:
+            if item in (step, '1'):
+                log.debug('disabling {} step for {} {}'.format(step, i, version))
+                return True
+            if item.startswith(prefix):
+                disabled.append(item[len(prefix):])
+        if i in disabled or str(version) in disabled or \
+                i.format(version=version) in disabled or \
+                i.format(version=version.major) in disabled:
+            log.debug('disabling {} step for {} {}'.format(step, i, version))
+            return True
+        return False
+
+    def run(func, interpreter, version, context):
+        step = func.__func__.__name__
+        args = get_args(context, step, version, interpreter)
+        if 'PYTHONPATH' in args:
+            env = dict(context['ENV'])
+            env['PYTHONPATH'] = args['PYTHONPATH']
+        else:
+            env = context['ENV']
+
+        before_cmd = get_option('before_{}'.format(step), interpreter, version)
+        if before_cmd:
+            if cfg.quiet:
+                log_file = join(args['home_dir'], 'before_{}_cmd.log'.format(step))
+            else:
+                log_file = False
+            command = before_cmd.format(**args)
+            output = execute(command, context['dir'], env, log_file)
+            if output['returncode'] != 0:
+                msg = 'exit code={}: {}'.format(output['returncode'], command)
+                raise Exception(msg)
+
+        result = func(context, args)
+
+        after_cmd = get_option('after_{}'.format(step), interpreter, version)
+        if after_cmd:
+            if cfg.quiet:
+                log_file = join(args['home_dir'], 'after_{}_cmd.log'.format(step))
+            else:
+                log_file = False
+            command = after_cmd.format(**args)
+            output = execute(command, context['dir'], env, log_file)
+            if output['returncode'] != 0:
+                msg = 'exit code={}: {}'.format(output['returncode'], command)
+                raise Exception(msg)
+        return result
+
     func = None
     if cfg.clean_only:
         func = plugin.clean
@@ -129,44 +213,68 @@
         func = plugin.install
     elif cfg.test_only:
         func = plugin.test
+
+    ### one function for each interpreter at a time mode ###
     if func:
         step = func.__func__.__name__
         for interpreter in cfg.interpreter:
             iversions = versions
-            if '{version}' not in interpreter:
+            if '{version}' not in interpreter and len(versions) > 1:
                 log.info('limiting Python versions to %s due to missing {version}'
-                         'in interpreter string', vrepr(versions[0]))
+                         ' in interpreter string', str(versions[0]))
                 iversions = versions[:1]  # just the default or closest to default
             for version in iversions:
+                if is_disabled(step, interpreter, version):
+                    continue
                 c = dict(context)
+                c['dir'] = get_option('dir', interpreter, version, cfg.dir)
+                c['destdir'] = get_option('destdir', interpreter, version, cfg.destdir)
                 try:
-                    func(c, get_args(c, step, version, interpreter))
+                    run(func, interpreter, version, c)
                 except Exception as err:
                     log.error('%s: plugin %s failed with: %s',
                               step, plugin.NAME, err, exc_info=cfg.verbose)
                     exit(13)
+                if step == 'install':
+                    ext_destdir = get_option('ext_destdir', interpreter, version)
+                    if ext_destdir:
+                        move_matching_files(c['destdir'], ext_destdir,
+                                            get_option('ext_pattern', interpreter, version))
         exit(0)
 
+    ### all functions for interpreters in batches mode ###
     try:
         context_map = {}
         for i in cfg.interpreter:
             iversions = versions
-            if '{version}' not in i:
+            if '{version}' not in i and len(versions) > 1:
                 log.info('limiting Python versions to %s due to missing {version}'
-                         'in interpreter string', vrepr(versions[0]))
+                         ' in interpreter string', str(versions[0]))
                 iversions = versions[:1]  # just the default or closest to default
             for version in iversions:
                 key = (i, version)
-                if key not in context_map:
-                    context_map[key] = dict(context)
-                c = context_map[key]
-                if not cfg.no_clean:
-                    plugin.clean(c, get_args(c, 'clean', version, i))
-                plugin.configure(c, get_args(c, 'configure', version, i))
-                plugin.build(c, get_args(c, 'build', version, i))
-                plugin.install(c, get_args(c, 'install', version, i))
-                if not cfg.no_tests:
-                    plugin.test(c, get_args(c, 'test', version, i))
+                if key in context_map:
+                    c = context_map[key]
+                else:
+                    c = dict(context)
+                    c['dir'] = get_option('dir', i, version, cfg.dir)
+                    c['destdir'] = get_option('destdir', i, version, cfg.destdir)
+                    context_map[key] = c
+
+                if not is_disabled('clean', i, version):
+                    run(plugin.clean, i, version, c)
+                if not is_disabled('configure', i, version):
+                    run(plugin.configure, i, version, c)
+                if not is_disabled('build', i, version):
+                    run(plugin.build, i, version, c)
+                if not is_disabled('install', i, version):
+                    run(plugin.install, i, version, c)
+                    ext_destdir = get_option('ext_destdir', i, version)
+                    if ext_destdir:
+                        move_matching_files(c['destdir'], ext_destdir,
+                                            get_option('ext_pattern', i, version))
+                if not is_disabled('test', i, version):
+                    run(plugin.test, i, version, c)
     except Exception as err:
         log.error('plugin %s failed: %s', plugin.NAME, err,
                   exc_info=cfg.verbose)
@@ -204,63 +312,75 @@
                         help='invoke install step for all requested Python versions')
     action.add_argument('--test', action='store_true', dest='test_only',
                         help='invoke tests for auto-detected build system')
+    action.add_argument('--list-systems', action='store_true',
+                        help='list available build systems and exit')
 
     arguments = parser.add_argument_group('BUILD SYSTEM ARGS', '''
         Additional arguments passed to the build system.
-        {version} will be replaced with current Python version.
         --system=custom requires complete command.''')
-    arguments.add_argument('--clean-args', metavar='ARGS',
-                           default=environ.get('PYBUILD_CLEAN_ARGS', ''))
-    arguments.add_argument('--configure-args', metavar='ARGS',
-                           default=environ.get('PYBUILD_CONFIGURE_ARGS', ''))
-    arguments.add_argument('--build-args', metavar='ARGS',
-                           default=environ.get('PYBUILD_BUILD_ARGS', ''))
-    arguments.add_argument('--install-args', metavar='ARGS',
-                           default=environ.get('PYBUILD_INSTALL_ARGS', ''))
-    arguments.add_argument('--test-args', metavar='ARGS',
-                           default=environ.get('PYBUILD_TEST_ARGS', ''))
-
-    dirs = parser.add_argument_group('DIRECTORIES', '''
-        {version} will be replaced with current Python version;
-        {interpreter} will be replaced with selected interpreter''')
+    arguments.add_argument('--before-clean', metavar='CMD',
+                           help='invoked before the clean command')
+    arguments.add_argument('--clean-args', metavar='ARGS')
+    arguments.add_argument('--after-clean', metavar='CMD',
+                           help='invoked after the clean command')
+
+    arguments.add_argument('--before-configure', metavar='CMD',
+                           help='invoked before the configure command')
+    arguments.add_argument('--configure-args', metavar='ARGS')
+    arguments.add_argument('--after-configure', metavar='CMD',
+                           help='invoked after the configure command')
+
+    arguments.add_argument('--before-build', metavar='CMD',
+                           help='invoked before the build command')
+    arguments.add_argument('--build-args', metavar='ARGS')
+    arguments.add_argument('--after-build', metavar='CMD',
+                           help='invoked after the build command')
+
+    arguments.add_argument('--before-install', metavar='CMD',
+                           help='invoked before the install command')
+    arguments.add_argument('--install-args', metavar='ARGS')
+    arguments.add_argument('--after-install', metavar='CMD',
+                           help='invoked after the install command')
+
+    arguments.add_argument('--before-test', metavar='CMD',
+                           help='invoked before the test command')
+    arguments.add_argument('--test-args', metavar='ARGS')
+    arguments.add_argument('--after-test', metavar='CMD',
+                           help='invoked after the test command')
+
+    dirs = parser.add_argument_group('DIRECTORIES')
     dirs.add_argument('-d', '--dir', action='store', metavar='DIR',
-                      default=environ.get('PYBUILD_DIR', getcwd()),
+                      default=getcwd(),
                       help='source files directory - base for other relative dirs [default: CWD]')
-    dirs.add_argument('--dest-dir', action='store', metavar='DIR',
+    dirs.add_argument('--dest-dir', action='store', metavar='DIR', dest='destdir',
                       default=environ.get('DESTDIR', 'debian/tmp'),
                       help='destination directory [default: debian/tmp]')
+    dirs.add_argument('--ext-dest-dir', action='store', metavar='DIR', dest='ext_destdir',
+                      default=environ.get('EXT_DESTDIR'),
+                      help='destination directory for .so files')
+    dirs.add_argument('--ext-pattern', action='store', metavar='PATTERN',
+                      default=environ.get('EXT_PATTERN', r'\.so(\.[^/]*)?$'),
+                      help='regular expression for files that should be moved'
+                      ' if --ext-destdir is set [default: .so files]')
     dirs.add_argument('--install-dir', action='store', metavar='DIR',
-                      default=environ.get('PYBUILD_INSTALL_DIR',
-                      # versioned dist-packages even for Python 3.X -
-                      # dh_python3 will fix it later (and will have a chance
-                      # to compare files)
-                      '/usr/lib/python{version}/dist-packages'),
                       help='installation directory [default: .../dist-packages]')
 
     limit = parser.add_argument_group('LIMITATIONS')
     limit.add_argument('-s', '--system',
                        default=environ.get('PYBUILD_SYSTEM'),
-                       help='selected build system [default: auto-detection]')
+                       help='select a build system [default: auto-detection]')
     limit.add_argument('-p', '--pyver', action='append', dest='versions',
                        help='''build for Python VERSION.
-                               This option can be used multiple times''')
+                               This option can be used multiple times
+                               [default: all supported Python 3.X versions]''')
     limit.add_argument('-i', '--interpreter', action='append',
                        help='change interpreter [default: python{version}]')
-
-    limit.add_argument('--no-tests', action='store_true',
-                       default=environ.get('PYBUILD_NO_TESTS') == '1',
-                       help='skip tests step after building module/extension')
-    limit.add_argument('--no-clean', action='store_false',
-                       default=environ.get('PYBUILD_NO_CLEAN') == '1',
-                       help='skip the clean step before building for next Python version')
-
-    other = parser.add_argument_group('OTHER')
-    other.add_argument('--list-systems', action='store_true',
-                       help='list available build systems and exit')
+    limit.add_argument('--disable', metavar='ITEMS',
+                       help='disable action, interpreter or version')
 
     args = parser.parse_args()
     if not args.interpreter:
-        args.interpreter = [environ.get('PYBUILD_INTERPRETER', 'python{version}')]
+        args.interpreter = environ.get('PYBUILD_INTERPRETERS', 'python{version}').split()
     if not args.versions:
         args.versions = environ.get('PYBUILD_VERSIONS', '').split()
     else:
@@ -281,6 +401,7 @@
         log.setLevel(logging.DEBUG)
     else:
         log.setLevel(logging.WARNING)
+    log.debug(sys.argv)
     main(cfg)
     # let dh/cdbs clean the .pybuild dir
     # rmtree(join(cfg.dir, '.pybuild'))

=== added file 'pybuild.rst'
--- pybuild.rst	1970-01-01 00:00:00 +0000
+++ pybuild.rst	2013-01-24 11:51:20 +0000
@@ -0,0 +1,165 @@
+=========
+ pybuild
+=========
+
+----------------------------------------------------------------------------------------------------
+invokes various build systems for requested Python versions in order to build modules and extensions
+----------------------------------------------------------------------------------------------------
+
+SYNOPSIS
+========
+  pybuild [ACTION] [BUILD SYSTEM ARGUMENTS] [DIRECTORIES] [OPTIONS]
+
+OPTIONS
+=======
+  Most options can be set (in addition to command line) via environment
+  variables. PyBuild will check:
+
+  * PYBUILD_OPTION_VERSIONED_INTERPRETER (f.e. PYBUILD_CLEAN_ARGS_python3.2)
+  * PYBUILD_OPTION_INTERPRETER (f.e. PYBUILD_CONFIGURE_ARGS_python3-dbg)
+  * PYBUILD_OPTION (f.e. PYBUILD_INSTALL_ARGS)
+
+optional arguments
+------------------
+  -h, --help            show this help message and exit
+  -v, --verbose         turn verbose mode on
+  -q, --quiet           doesn't show external command's output
+  -qq, --really-quiet   be quiet
+  --version             show program's version number and exit
+
+ACTION
+------
+  The default is to build, install and test the library using detected build
+  system version by version. Selecting one of following actions, will invoke
+  given action for all versions - one by one - which (contrary to the default
+  action) in some build systems can overwrite previous results.
+
+    --detect
+        return the name of detected build system
+    --clean
+        clean files using auto-detected build system specific methods
+    --configure
+        invoke configure step for all requested Python versions
+    --build
+        invoke build step for all requested Python versions
+    --install
+        invoke install step for all requested Python versions
+    --test
+        invoke tests for auto-detected build system
+    --list-systems
+        list available build systems and exit
+
+BUILD SYSTEM ARGUMENTS
+----------------------
+  Additional arguments passed to the build system.
+  --system=custom requires complete command.
+
+    --before-clean COMMAND
+        invoked before the clean command
+    --clean-args ARGUMENTS
+        arguments added to clean command generated by build system plugin
+    --after-clean COMMAND
+        invoked after the clean command
+    --before-configure COMMAND
+        invoked before the configure command
+    --configure-args ARGUMENTS
+        arguments added to configure command generated by build system plugin
+    --after-configure COMMAND
+        invoked after the configure command
+    --before-build COMMAND
+        invoked before the build command
+    --build-args ARGUMENTS
+        arguments added to build command generated by build system plugin
+    --after-build COMMAND
+        invoked after the build command
+    --before-install COMMAND
+        invoked before the install command
+    --install-args ARGUMENTS
+        arguments added to install command generated by build system plugin
+    --after-install COMMAND
+        invoked after the install command
+    --before-test COMMAND
+        invoked before the test command
+    --test-args ARGUMENTS
+        arguments added to test command generated by build system plugin
+    --after-test COMMAND
+        invoked after the test command
+
+variables that can be used in `ARGUMENTS` and `COMMAND`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `{version}` will be replaced with current Python version,
+* `{interpreter}` will be replaced with current interpreter,
+* `{dir}` will be replaced with sources directory,
+* `{destdir}` will be replaced with destination directory,
+* `{home_dir}` will be replaced with temporary HOME directory,
+  where plugins can keep their data
+  (.pybuild/interpreter_version/ by default),
+* `{build_dir}` will be replaced with build directory
+* `{install_dir}` will be replaced with install directory.
+
+DIRECTORIES
+-----------
+  -d DIR, --dir DIR
+      set source files directory - base for other relative dirs
+      [by default: current working directory]
+  --dest-dir DIR
+      set destination directory [default: debian/tmp]
+  --ext-dest-dir DIR
+      set destination directory for .so files
+  --ext-pattern PATTERN
+      regular expression for files that should be moved if --ext-destdir is set
+      [default: `\.so(\.[^/]*)?$`]
+  --install-dir DIR
+      set installation directory [default: .../dist-packages]
+
+variables that can be used in `DIR`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `{version}` will be replaced with current Python version,
+* `{interpreter}` will be replaced with selected interpreter.
+
+LIMITATIONS
+-----------
+  -s SYSTEM, --system SYSTEM
+	select a build system [default: auto-detection]
+  -p VERSIONS, --pyver VERSIONS
+        build for Python VERSIONS. This option can be used multiple times.
+        Versions can be separated by space character.
+        The default is all Python 3.X supported versions.
+  -i INTERPRETER, --interpreter INTERPRETER
+	change interpreter [default: python{version}]
+  --disable ITEMS
+        disable action, interpreter, version or any mix of them.
+
+disable examples
+~~~~~~~~~~~~~~~~
+* `--disable test/python2.5-dbg` - disables tests for python2.5-dbg
+* `--disable '2.4 2.7'` - disables all actions for version 2.4 and 2.7
+* `PYBUILD_DISABLE_python2=1` - disables all actions for Python 2.X
+* `PYBUILD_DISABLE_python3.3=test` - disables tests for Python 3.3
+* `PYBUILD_DISABLE=test/python3.3` - same as above
+* `PYBUILD_DISABLE='configure/python3 2.4 pypy'` - disables configure
+  action for all python3 interpreters, all actions for version 2.4, and
+  all actions for pypy
+
+DEBHELPER COMMAND SEQUENCER INTEGRATION
+=======================================
+* build depend on python3 (>= 3.3.0-2)
+* add "--buildsystem=pybuild" to dh's arguments in debian/rules
+* if more than one binary package is build:
+  add debian/python-foo.install files, or
+  export PYBUILD_DESTDIR env. variables in debian/rules 
+
+debian/rules file example::
+
+ export PYBUILD_DESTDIR_python2=debian/python-foo/
+ export PYBUILD_DESTDIR_python2-dbg=debian/python-foo-dbg/
+ export PYBUILD_DESTDIR_python3=debian/python3-foo/
+ export PYBUILD_DESTDIR_python3-dbg=debian/python3-foo-dbg/
+ %:
+  	dh $@ --with python2,python3 --buildsystem=pybuild
+
+SEE ALSO
+========
+* dh_python2(1)
+* dh_python3(1)
+* http://deb.li/pybuild - most recent version of this document

=== modified file 'tests/t1/debian/compat'
--- tests/t1/debian/compat	2010-06-18 00:10:21 +0000
+++ tests/t1/debian/compat	2013-01-24 11:51:20 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'tests/t1/debian/control'
--- tests/t1/debian/control	2012-10-21 21:29:45 +0000
+++ tests/t1/debian/control	2013-01-24 11:51:20 +0000
@@ -2,8 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Piotr Ożarowski <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: python-all
+Build-Depends: debhelper (>= 7.0.50~), python3-all
 Standards-Version: 3.9.0
 X-Python3-Version: >= 3.1, << 3.4
 

=== modified file 'tests/t1/debian/rules'
--- tests/t1/debian/rules	2011-04-03 19:02:43 +0000
+++ tests/t1/debian/rules	2013-01-24 11:51:20 +0000
@@ -5,7 +5,8 @@
 override_dh_auto_install:
 	python3 setup.py install --root=debian/python3-foo/
 
-override_dh_pysupport:
+override_dh_install:
+	dh_install
 	find debian/ -name jquery.js -exec \
 	ln -fs /usr/share/javascript/jquery/jquery.js '{}' \;
 	DH_VERBOSE=1 ../../dh_python3\

=== modified file 'tests/t2/debian/compat'
--- tests/t2/debian/compat	2011-04-03 19:02:43 +0000
+++ tests/t2/debian/compat	2013-01-24 11:51:20 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'tests/t2/debian/rules'
--- tests/t2/debian/rules	2012-12-12 10:45:17 +0000
+++ tests/t2/debian/rules	2013-01-24 11:51:20 +0000
@@ -5,7 +5,8 @@
 %:
 	dh $@ --buildsystem=python_distutils
 
-override_dh_pysupport:
+override_dh_install:
+	dh_install
 	# install also as private extension
 	dh_install debian/python3-foo/usr/local/lib/python3*/dist-packages/foo/bar*.so \
 		/usr/lib/python3-foo/

=== modified file 'tests/t3/debian/compat'
--- tests/t3/debian/compat	2011-04-03 19:02:43 +0000
+++ tests/t3/debian/compat	2013-01-24 11:51:20 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'tests/t3/debian/rules'
--- tests/t3/debian/rules	2011-04-03 19:02:43 +0000
+++ tests/t3/debian/rules	2013-01-24 11:51:20 +0000
@@ -5,7 +5,8 @@
 %:
 	dh $@
 
-override_dh_pysupport:
+override_dh_install:
+	dh_install
 	DH_VERBOSE=1 ../../dh_python3
 
 override_dh_auto_build:

=== modified file 'tests/t4/debian/compat'
--- tests/t4/debian/compat	2012-06-30 15:20:39 +0000
+++ tests/t4/debian/compat	2013-01-24 11:51:20 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'tests/t4/debian/rules'
--- tests/t4/debian/rules	2012-06-30 15:20:39 +0000
+++ tests/t4/debian/rules	2013-01-24 11:51:20 +0000
@@ -2,7 +2,8 @@
 %:
 	dh $@ --buildsystem=python_distutils
 
-override_dh_pysupport:
+override_dh_install:
+	dh_install
 	DH_VERBOSE=1 ../../dh_python3
 	DH_VERBOSE=1 ../../dh_python3 /usr/share/bar
 	DH_VERBOSE=1 ../../dh_python3 /usr/share/baz32 --shebang '/usr/bin/python3.2 -OO'