[Python-modules-commits] r21443 - in packages/beautifulsoup4/trunk/debian (3 files)

[stefanor at users.alioth.debian.org]

    Date: Saturday, April 28, 2012 @ 12:44:52
  Author: stefanor
Revision: 21443

* New upstream release.
* Use nose for python3 tests too.
  - B-D on python3-nose.

Modified:
  packages/beautifulsoup4/trunk/debian/changelog
  packages/beautifulsoup4/trunk/debian/control
  packages/beautifulsoup4/trunk/debian/rules

Modified: packages/beautifulsoup4/trunk/debian/changelog
===================================================================
--- packages/beautifulsoup4/trunk/debian/changelog	2012-04-26 19:39:21 UTC (rev 21442)
+++ packages/beautifulsoup4/trunk/debian/changelog	2012-04-28 12:44:52 UTC (rev 21443)
@@ -1,3 +1,11 @@
+beautifulsoup4 (4.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use nose for python3 tests too.
+    - B-D on python3-nose.
+
+ -- Stefano Rivera <stefanor at debian.org>  Sat, 28 Apr 2012 14:42:27 +0200
+
 beautifulsoup4 (4.0.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/beautifulsoup4/trunk/debian/control
===================================================================
--- packages/beautifulsoup4/trunk/debian/control	2012-04-26 19:39:21 UTC (rev 21442)
+++ packages/beautifulsoup4/trunk/debian/control	2012-04-28 12:44:52 UTC (rev 21443)
@@ -12,6 +12,7 @@
  python-sphinx (>= 1.0.7+dfsg),
  python3-all (>= 3.1.2),
  python3-lxml,
+ python3-nose,
  python3-pkg-resources
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.3

Modified: packages/beautifulsoup4/trunk/debian/rules
===================================================================
--- packages/beautifulsoup4/trunk/debian/rules	2012-04-26 19:39:21 UTC (rev 21442)
+++ packages/beautifulsoup4/trunk/debian/rules	2012-04-28 12:44:52 UTC (rev 21443)
@@ -1,42 +1,37 @@
 #!/usr/bin/make -f
 
-PYVERS   := $(shell pyversions -r)
-PY3VERS  := $(shell py3versions -r)
+PYVERS   := $(shell pyversions -rv)
+PY3VERS  := $(shell py3versions -rv)
 
+include /usr/share/python/python.mk
+
 %:
 	dh $@ --with python2,python3,sphinxdoc
 
 override_dh_auto_build:
 	set -xe; \
 	for py in $(PYVERS) $(PY3VERS); do \
-		$$py setup.py build; \
+		python$$py setup.py build; \
 	done
 	sphinx-build -aEN -b html -d build/doctrees doc/source build/html
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -xe; \
-	export PYTHONPATH=.; \
 	for py in $(PYVERS); do \
-		$$py /usr/bin/nosetests; \
+		nosetests-$$py -w $(call py_builddir_sh,$$py); \
 	done
-	set -xe; \
-	cd build/lib; \
-	export PYTHONPATH=.; \
-	for py in $(PY3VERS); do \
-		$$py -m unittest discover -s bs4; \
-	done
 endif
 
 override_dh_auto_install:
 	set -xe; \
 	for py in $(PYVERS); do \
-		$$py setup.py install --skip-build --root debian/python-bs4 \
+		python$$py setup.py install --skip-build --root debian/python-bs4 \
 			--install-layout deb; \
 	done
 	set -xe; \
 	for py in $(PY3VERS); do \
-		$$py setup.py install --skip-build --root debian/python3-bs4 \
+		python$$py setup.py install --skip-build --root debian/python3-bs4 \
 			--install-layout deb; \
 	done