[Python-modules-commits] [lazr.delegates] 07/07: d/control: Bumped Standards-Version to 3.9.6 with no other changes needed.

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository lazr.delegates.

commit 3b8f13ae1c1ca6795dbe2540847557df0d1c2e4d
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jan 9 17:21:57 2015 -0500

    d/control: Bumped Standards-Version to 3.9.6 with no other changes needed.
    
    * d/control: Bumped Standards-Version to 3.9.6 with no other changes needed.
    * d/rules: Added PYBUILD_TEST_NOSE=1 to invoke the correct test runner.
---
 debian/changelog | 6 ++----
 debian/control   | 4 ++--
 debian/rules     | 7 ++-----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f4cfb4..7b02a2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,8 @@
 lazr.delegates (2.0.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * d/control:
-    - Bumped Standards-Version to 3.9.6 with no other changes needed.
-    - Switched Build-Depends from python{,3}-nose to python{,3}-nose2.
-  * d/rules: Added override_dh_auto_test to invoke nose2 tests.
+  * d/control: Bumped Standards-Version to 3.9.6 with no other changes needed.
+  * d/rules: Added PYBUILD_TEST_NOSE=1 to invoke the correct test runner.
 
  -- Barry Warsaw <barry at debian.org>  Fri, 09 Jan 2015 17:04:45 -0500
 
diff --git a/debian/control b/debian/control
index f13c048..e578f79 100644
--- a/debian/control
+++ b/debian/control
@@ -11,12 +11,12 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                python-all (>= 2.6.6-3~),
                python-docutils,
-               python-nose2,
+               python-nose,
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg-1~),
                python-zope.interface,
                python3-all,
-               python3-nose2,
+               python3-nose,
                python3-setuptools,
                python3-zope.interface
 Standards-Version: 3.9.6
diff --git a/debian/rules b/debian/rules
index d9ac3f5..f528ec2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=lazr.delegates
-export DH_VERBOSE=1
+export PYBUILD_TEST_NOSE=1
+#export DH_VERBOSE=1
 
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
@@ -11,10 +12,6 @@ override_dh_install:
 	rm -f debian/python-lazr.delegates/usr/lib/python2.7/dist-packages/lazr/delegates/_python3.py
 	rm -f debian/python3-lazr.delegates/usr/lib/python3.*/dist-packages/lazr/delegates/_python2.py
 
-override_dh_auto_test:
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="{interpreter} -m nose2 -v" dh_auto_test
-
 override_dh_installdocs:
 	python setup.py build_sphinx
 	dh_installdocs

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