[Python-modules-commits] [pytest] 10/10: Clean up more of the debian/rules file.

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository pytest.

commit 398b08eefba3f2f09fa6ddf7cffaef6629480b60
Author: Barry Warsaw <barry at python.org>
Date:   Wed Dec 16 18:50:01 2015 -0500

    Clean up more of the debian/rules file.
---
 debian/rules | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/debian/rules b/debian/rules
index 45ae559..d2ad453 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,21 +5,18 @@
 export DH_VERBOSE=1
 export PYBUILD_NAME=pytest
 export PYBUILD_VERBOSE=1
-# export PYBUILD_TEST_TOX=1
-# export PYBUILD_TEST_ARGS=--sitepackages
-
-# PYVERS :=  $(shell pyversions -vr)
-# PY3VERS := $(shell py3versions -vr)
-
-# UPSTREAM = $(shell dpkg-parsechangelog | egrep "^Version: "| sed 's/Version: \(.*\)-.*/\1/' )
 
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-# The old way of running the tests doesn't work any more as of pytest 2.8.5,
-# so we can no longer run them during package build.  Rely on DEP-8 to run the
-# test suite now.
+# 2015-12-16 barry at debian.org: Run the test suite from the source directory,
+# not the .pybuild directory.  Also, because pytest does not clean up after
+# itself, use a custom temporary directory (which is easier to clean up
+# manually, e.g. in an sbuild).
 override_dh_auto_test:
+	TMPDIR=`mktemp -t -d pytest.XXXXXXXXXX` \
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="cd {dir}; {interpreter} -m pytest --lsof -rfsxX testing" dh_auto_test
 
 override_dh_installdocs:
 	PYTHONPATH=`pwd` make -C doc/en man
@@ -41,24 +38,6 @@ override_dh_auto_install:
 		debian/python3-pytest/usr/bin/py.test-3.5
 	rm -rf debian/python3-pytest/usr/lib/python3.5
 
-# override_dh_install:
-# 	# Only install for the default versions.
-# 	python setup.py install --skip-build --no-compile \
-# 							--root debian/python-pytest \
-# 							--install-layout=deb
-# 	rm debian/python-pytest/usr/bin/*
-# 	install -m 755 debian/py.test.template debian/python-pytest/usr/bin/py.test
-# 	sed -i 's/#UPSTREAMVERSION#/$(UPSTREAM)/' debian/python-pytest/usr/bin/py.test
-# 	sed -i 's,#PYSHEBANG#,#!/usr/bin/python,' debian/python-pytest/usr/bin/py.test
-# 	python3 setup.py install --skip-build --no-compile \
-# 								--root debian/python3-pytest \
-# 								--install-layout=deb
-# 	rm debian/python3-pytest/usr/bin/*
-# 	install -m 755 debian/py.test.template debian/python3-pytest/usr/bin/py.test-3
-# 	sed -i 's/#UPSTREAMVERSION#/$(UPSTREAM)/' debian/python3-pytest/usr/bin/py.test-3
-# 	sed -i 's,#PYSHEBANG#,#!/usr/bin/python3,' debian/python3-pytest/usr/bin/py.test-3
-# 	dh_install
-
 # override_dh_auto_clean:
 # 	rm -rf doc/en/_build build pytest.egg-info
 # 	find . \( -name '*.py[oc]' -o -name __pycache__ \) -delete

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