[Python-modules-commits] r26755 - in packages/html5lib/trunk/debian (control rules)

[obergix at users.alioth.debian.org]

    Date: Friday, December 13, 2013 @ 11:34:44
  Author: obergix
Revision: 26755

Add tests using nosetests/nosetests3

Modified:
  packages/html5lib/trunk/debian/control
  packages/html5lib/trunk/debian/rules

Modified: packages/html5lib/trunk/debian/control
===================================================================
--- packages/html5lib/trunk/debian/control	2013-12-13 11:34:37 UTC (rev 26754)
+++ packages/html5lib/trunk/debian/control	2013-12-13 11:34:44 UTC (rev 26755)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Olivier Berger <obergix at debian.org>
-Build-Depends: debhelper (>= 8), dh-python, python-all (>= 2.6.6-3~), python-setuptools, python3-all, python3-setuptools 
+Build-Depends: debhelper (>= 8), dh-python, python-all (>= 2.6.6-3~), python-setuptools, python3-all, python3-setuptools, python-nose
 # flake8, nose
 #Build-Depends-Indep: python-lxml, python-simplejson, python-chardet
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/html5lib/trunk/

Modified: packages/html5lib/trunk/debian/rules
===================================================================
--- packages/html5lib/trunk/debian/rules	2013-12-13 11:34:37 UTC (rev 26754)
+++ packages/html5lib/trunk/debian/rules	2013-12-13 11:34:44 UTC (rev 26755)
@@ -2,44 +2,21 @@
 
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
+export PYBUILD_VERBOSE=1
+#export NOSE_VERBOSE=2
 
 export PYBUILD_NAME=html5lib
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
-# # PYVERS:=$(shell pyversions -vr)
-# # pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
-# PY3REQUESTED := $(shell py3versions -r)
-# PY3DEFAULT := $(shell py3versions -d)
-# PYTHON3 := $(filter-out $(PY3DEFAULT),$(PY3REQUESTED)) python3
-
-
-# override_dh_auto_build:
-# 	# Build for each Python 3 version
-# 	set -ex; for python in $(PYTHON3); do \
-# 		$$python setup.py build; \
-# 	done
-# 	dh_auto_build
-
-# override_dh_auto_test:
-# ifeq (test-suite-is-broken-again,yes)
-# ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-# 	set -e ;\
-# 	   cd html5lib/tests ;\
-# 		for py in $(PYVERS); do  \
-# 			PYTHONPATH=$(call pythonpath,$$py) python$$py runtests.py; \
-# 	done
-# endif
-# endif
-
-# # override_dh_auto_install:
-# # 	dh_auto_install
-# # 	find debian/python-html5lib -type d -name tests -exec rm {} \;
-
-# override_dh_auto_install:
-# 	# The same for install; note the --install-layout=deb option
-# 	set -ex; for python in $(PYTHON3); do \
-# 		$$python setup.py install --install-layout=deb --root=debian/tmp; \
-# 	done
-# 	dh_auto_install
+#export PYBUILD_TEST_NOSE=1
+override_dh_auto_test:
+	# First, Python 2's nosetests
+	PYBUILD_DISABLE_python3=test \
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="nosetests" dh_auto_test --buildsystem=pybuild
+	# Then for Python 3 :
+	PYBUILD_DISABLE_python2=test \
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="nosetests3" dh_auto_test --buildsystem=pybuild