[Python-modules-commits] [betamax] 08/09: Bump dh-python to >= 2.20160609

[Daniele Tricoli]

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

eriol-guest pushed a commit to branch master
in repository betamax.

commit 349c59f4d62c947a92822152e89a923e25046684
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Thu Jul 14 01:55:37 2016 +0200

    Bump dh-python to >= 2.20160609
    
    Since it was backported to Jessie, betamax can build there without
    changes in the packaging, so the custom pybuild system for testing can
    be removed.
---
 debian/control | 2 +-
 debian/rules   | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 6e35b7c..a43ccd7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Daniele Tricoli <eriol at mornie.org>,
  Ian Cordasco <graffatcolmingov at gmail.com>
 Build-Depends:
  debhelper (>= 9),
- dh-python,
+ dh-python (>= 2.20160609),
  python-all,
  python-mock,
  python-pytest,
diff --git a/debian/rules b/debian/rules
index 64bb6a0..f7195af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export PYBUILD_NAME=betamax
 # is broken due unbundling in Debian
 # (see https://github.com/kennethreitz/requests/issues/2870) and remaining
 # tests need Internet connection.
-PYTEST_ARGS = --ignore tests/integration/test_fixtures.py \
+export PYBUILD_TEST_ARGS = --ignore tests/integration/test_fixtures.py \
 	--ignore tests/integration/test_hooks.py \
 	--ignore tests/integration/test_placeholders.py \
 	--ignore tests/integration/test_record_modes.py \
@@ -27,10 +27,3 @@ ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 		debian/python-betamax-doc/usr/share/doc/python-betamax-doc/html/
 	dh_sphinxdoc
 endif
-
-# Tests must be copied manually since Jessie dh-python doesn't copy them.
-# Depending on dh-python >= 2.20151103 is an alternative, but it's not in
-# Jessie yet.
-override_dh_auto_test:
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="cp -r {dir}/tests {build_dir}/tests; cd {build_dir}; {interpreter} -m pytest $(PYTEST_ARGS)" dh_auto_test

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