[Python-modules-commits] [pytest] 01/03: Build documentation in *build* step and not in install step

[Sebastian Ramacher]

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

sramacher pushed a commit to branch master
in repository pytest.

commit 9211d0965791e4556a94844f659ab4528b65cfa0
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jan 19 15:21:28 2016 +0100

    Build documentation in *build* step and not in install step
---
 debian/rules | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 23d9583..cca7ce7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,8 @@ export PYBUILD_VERBOSE=1
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-# 2015-12-16 barry at debian.org: 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 $$TMPDIR && {interpreter} -m pytest --lsof -rfsxX --ignore={dir}/testing/cx_freeze {dir}/testing" dh_auto_test
-
-override_dh_installdocs:
+override_dh_auto_build:
+	dh_auto_build
 	PYTHONPATH=`pwd` make -C doc/en man
 	cp doc/en/_build/man/pytest.1 debian/py.test.1
 	cp debian/py.test.1 debian/py.test-3.1
@@ -25,7 +18,14 @@ override_dh_installdocs:
 	sed -i 's/PYTEST/PY.TEST-3/g' debian/py.test-3.1
 	sed -i 's/py\.test/py.test-3/g' debian/py.test-3.1
 	PYTHONPATH=`pwd` make -C doc/en/ html
-	dh_installdocs
+
+# 2015-12-16 barry at debian.org: 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 $$TMPDIR && {interpreter} -m pytest --lsof -rfsxX --ignore={dir}/testing/cx_freeze {dir}/testing" dh_auto_test
 
 override_dh_auto_install:
 	dh_auto_install

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