[Python-modules-commits] [python-flake8] 06/12: d/rules: Cleanup and use pybuild

[Ondřej Nový]

This is an automated email from the git hooks/post-receive script.

onovy pushed a commit to branch master
in repository python-flake8.

commit 6354ec3aca67cb0f06becdae2fdffe9124669c27
Author: Ondřej Nový <onovy at debian.org>
Date:   Mon Aug 8 00:26:39 2016 +0200

    d/rules: Cleanup and use pybuild
---
 debian/changelog |  1 +
 debian/rules     | 35 +++++------------------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c60df6..41031f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ python-flake8 (3.0.3-1) UNRELEASED; urgency=medium
   * Bumped required Python version to 2.7 / 3.4
   * Rearranged B-D for new upstream version
   * Renaming pep8 to pycodestyle
+  * d/rules: Cleanup and use pybuild
 
  -- Barry Warsaw <barry at debian.org>  Mon, 20 Jun 2016 12:27:19 -0400
 
diff --git a/debian/rules b/debian/rules
index 69e8c6d..f4e359a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
-PYVERS=$(shell pyversions -r)
-PY3VERS=$(shell py3versions -r)
+
+export PYBUILD_NAME = flake8
 
 %:
-	dh $@  --with python2,python3
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
 override_dh_auto_clean:
 	rm -rf flake8.egg-info
@@ -13,40 +13,15 @@ override_dh_auto_clean:
 
 override_dh_auto_test:
 	touch tox.ini
-	set -xe; \
-	for py in $(PYVERS) $(PY3VERS); do \
-		$$py setup.py test; \
-	done
-
-override_dh_auto_build:
-	set -xe; \
-	for py in $(PYVERS) $(PY3VERS); do \
-		$$py setup.py build; \
-	done
-
-	# Remove me when dh_python2 can handle this file
-	rm -vf debian/*/usr/lib/python*/*-packages/*.egg-info/SOURCES.txt
+	PYBUILD_SYSTEM=custom PYBUILD_TEST_ARGS="{interpreter} setup.py test" dh_auto_test
 
 override_dh_auto_install:
-	set -xe; \
-	for py in $(PYVERS); do \
-		$$py setup.py install  --root=debian/python-flake8 --install-layout=deb ; \
-	done
-	set -xe; \
-	for py in $(PY3VERS); do \
-		$$py setup.py install  --root=debian/python3-flake8 --install-layout=deb ; \
-	done
+	dh_auto_install
 
 	rm -rf debian/python-flake8/usr/bin
 	mkdir -p debian/flake8/usr
 	mv $(CURDIR)/debian/python3-flake8/usr/bin $(CURDIR)/debian/flake8/usr/
 
-override_dh_python2:
-	dh_python2 --shebang=/usr/bin/python
-
-override_dh_python3:
-	dh_python3 --shebang=/usr/bin/python3
-
 override_dh_installchangelogs:
 	rm -f debian/upstream-changelog
 	set -e ; for i in $$(find docs/source/release-notes -name "*.rst" | sort -V -r) ; do \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-flake8.git