[Python-modules-commits] [flask-login] 01/09: Revert "Run tests with pybuild instead of runner script"

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository flask-login.

commit feb63498f94ef8a91cd5b559930b75b37e3e37ce
Author: Carl Suster <carl at contraflo.ws>
Date:   Fri Dec 1 13:44:19 2017 +1100

    Revert "Run tests with pybuild instead of runner script"
    
    This reverts commit d1ea1ab1b15b85b2f8bea131955383aabfce4385.
    
    Upstream changed their mind.
---
 debian/changelog | 3 ---
 debian/rules     | 7 +++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ed4982..4e0139b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,6 @@
 flask-login (0.4.0-2) UNRELEASED; urgency=medium
 
   * Add Forwarded headers to patches.
-  * Drop 0002-allow-choice-of-nosetests-executable-in-run-tests.sh.patch
-    Upstream does not wish to merge this patch and we instead ignore their test
-    runner shell script and use standard pybuild commands in d/rules.
 
  -- Carl Suster <carl at contraflo.ws>  Thu, 12 Jan 2017 12:36:53 +1100
 
diff --git a/debian/rules b/debian/rules
index 08d3001..ea1cde3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 
 export PYBUILD_NAME=flask-login
 
-export PYBUILD_BEFORE_TEST=cp test_*.py {build_dir}
-export PYBUILD_AFTER_TEST=rm {build_dir}/test_*.py
 
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem pybuild
@@ -17,5 +15,10 @@ ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	dh_sphinxdoc
 endif
 
+override_dh_auto_test:
+	# NB: NOCOLOR can be removed if a B-D on
+	# python3-nose-yanc is added (See #850589)
+	NOCOLOR=1 NOSETEST=nosetests3 make test
+
 override_dh_compress:
 	dh_compress -X html/

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