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

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

    Date: Sunday, July 12, 2015 @ 18:16:57
  Author: eriol-guest
Revision: 33356

Switch to pybuild

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

Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog	2015-07-12 17:43:03 UTC (rev 33355)
+++ packages/circuits/trunk/debian/changelog	2015-07-12 18:16:57 UTC (rev 33356)
@@ -1,6 +1,7 @@
 circuits (3.1.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Switch to pybuild.
   * debian/watch
     - Use pypi.debian.net redirector.
   * debian/patches/01_disable_sphinxcontrib_extensions.patch
@@ -12,7 +13,7 @@
   * debian/patches/05_fix-pil-import.patch
     - Remove since it is not needed anymore.
 
- -- Daniele Tricoli <eriol at mornie.org>  Sun, 12 Jul 2015 18:33:02 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Sun, 12 Jul 2015 20:13:11 +0200
 
 circuits (2.1.0-2) unstable; urgency=low
 

Modified: packages/circuits/trunk/debian/control
===================================================================
--- packages/circuits/trunk/debian/control	2015-07-12 17:43:03 UTC (rev 33355)
+++ packages/circuits/trunk/debian/control	2015-07-12 18:16:57 UTC (rev 33356)
@@ -5,6 +5,7 @@
 Uploaders: Daniele Tricoli <eriol at mornie.org>
 Build-Depends:
  debhelper (>= 9),
+ dh-python,
  python-all (>= 2.6.6-3~),
  python-coverage,
  python-pyinotify,

Modified: packages/circuits/trunk/debian/rules
===================================================================
--- packages/circuits/trunk/debian/rules	2015-07-12 17:43:03 UTC (rev 33355)
+++ packages/circuits/trunk/debian/rules	2015-07-12 18:16:57 UTC (rev 33356)
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
-PY2VERS := $(shell pyversions -r)
-PY3VERS := $(shell py3versions -r)
+export PYBUILD_NAME=circuits
+export PYBUILD_DISABLE=test
 
 %:
-	dh $(@) --with python2,python3,sphinxdoc -Spython_distutils
+	dh $(@) --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_clean:
 	rm -rf build
@@ -15,35 +15,18 @@
 	dh_auto_clean
 
 override_dh_auto_build:
-	set -e -x; \
-	for python in $(PY2VERS); do \
-		$$python setup.py build -e /usr/bin/python; \
-	done
-	for python in $(PY3VERS); do \
-		$$python setup.py build -e /usr/bin/python3; \
-	done
+	dh_auto_build
 
 	PYTHONPATH=. sphinx-build -N -bhtml docs/source docs/build/html
 
 	# Copy manpages for Python3 scripts
-	cp man/circuits.bench.1 man/circuits.bench3.1
-	cp man/circuits.web.1 man/circuits.web3.1
-	sed -i 's/circuits.bench/circuits.bench3/g' man/circuits.bench3.1
-	sed -i 's/circuits.web/circuits.web3/g' man/circuits.web3.1
+	# cp man/circuits.bench.1 man/circuits.bench3.1
+	# cp man/circuits.web.1 man/circuits.web3.1
+	# sed -i 's/circuits.bench/circuits.bench3/g' man/circuits.bench3.1
+	# sed -i 's/circuits.web/circuits.web3/g' man/circuits.web3.1
 
 override_dh_auto_install:
-	set -e -x; \
-	for python2 in $(PY2VERS); do \
-		$$python2 setup.py install --skip-build --root debian/python-circuits \
-			--install-layout deb; \
-	done
-
-	set -e -x; \
-	for python3 in $(PY3VERS); do \
-		$$python3 setup.py install --skip-build --root debian/python3-circuits \
-			--install-layout deb; \
-	done
-
+	dh_auto_install
 	# Remove tests to not pollute namespace.
 	rm -rf debian/python*-circuits/usr/lib/python*/dist-packages/tests
 
@@ -57,12 +40,5 @@
 	sed -i '1c#!/usr/bin/python' debian/python-circuits/usr/bin/circuits.web
 	sed -i '1c#!/usr/bin/python3' debian/python3-circuits/usr/bin/circuits.web3
 
-override_dh_auto_test:
-ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-	# Upstream is calling directly py.test inside a Popen so, for now, tests
-	# are run only for the default version
-	set -e; python setup.py test;
-endif
-
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.rst