[Python-modules-commits] r27619 - in packages/billiard/trunk/debian (5 files)

[fladi-guest at users.alioth.debian.org]

    Date: Wednesday, February 12, 2014 @ 12:56:02
  Author: fladi-guest
Revision: 27619

New upstream release (Closes: #735201).

Modified:
  packages/billiard/trunk/debian/changelog
  packages/billiard/trunk/debian/control
  packages/billiard/trunk/debian/patches/remove-nose-cover3.patch
  packages/billiard/trunk/debian/rules
Deleted:
  packages/billiard/trunk/debian/python-billiard.install

Modified: packages/billiard/trunk/debian/changelog
===================================================================
--- packages/billiard/trunk/debian/changelog	2014-02-12 09:54:17 UTC (rev 27618)
+++ packages/billiard/trunk/debian/changelog	2014-02-12 12:56:02 UTC (rev 27619)
@@ -1,3 +1,13 @@
+billiard (3.3.0.16-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Enable tests during build (Closes: #735201).
+  * Enable Python3 support with python3-billiard.
+  * Extend remove-nose-cover3.patch to also remove nose-cover3 from funtests
+    package.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Wed, 12 Feb 2014 12:16:52 +0100
+
 billiard (3.3.0.15-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/billiard/trunk/debian/control
===================================================================
--- packages/billiard/trunk/debian/control	2014-02-12 09:54:17 UTC (rev 27618)
+++ packages/billiard/trunk/debian/control	2014-02-12 12:56:02 UTC (rev 27619)
@@ -10,8 +10,14 @@
                python-nose,
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg-1~),
-               python-unittest2
+               python-unittest2,
+               python3-all-dev,
+               python3-mock,
+               python3-nose,
+               python3-setuptools,
+               python3-sphinx
 X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
 Standards-Version: 3.9.5
 Homepage: https://github.com/celery/billiard
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/billiard/trunk/
@@ -26,6 +32,17 @@
  It extends the multiprocessing.Pool with a billiard.pool.DynamicPool
  that can grow in size.
 
+Package: python3-billiard
+Architecture: any
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Suggests: python-billiard-doc
+Description: Multiprocessing Pool Extensions for Python (Python3 version)
+ This package contains extensions to the multiprocessing Pool.
+ It extends the multiprocessing.Pool with a billiard.pool.DynamicPool
+ that can grow in size.
+ .
+ This package contains the Python 3 version of the library.
+
 Package: python-billiard-doc
 Section: doc
 Architecture: all

Modified: packages/billiard/trunk/debian/patches/remove-nose-cover3.patch
===================================================================
--- packages/billiard/trunk/debian/patches/remove-nose-cover3.patch	2014-02-12 09:54:17 UTC (rev 27618)
+++ packages/billiard/trunk/debian/patches/remove-nose-cover3.patch	2014-02-12 12:56:02 UTC (rev 27619)
@@ -24,3 +24,19 @@
  nose
 -nose-cover3
  mock
+--- a/funtests/setup.py
++++ b/funtests/setup.py
+@@ -44,7 +44,6 @@
+     test_suite='nose.collector',
+     build_requires=[
+         'nose',
+-        'nose-cover3',
+         'unittest2',
+         'coverage>=3.0',
+     ],
+--- a/requirements/test3.txt
++++ b/requirements/test3.txt
+@@ -1,3 +1,2 @@
+ nose
+-nose-cover3
+ mock

Deleted: packages/billiard/trunk/debian/python-billiard.install
===================================================================
--- packages/billiard/trunk/debian/python-billiard.install	2014-02-12 09:54:17 UTC (rev 27618)
+++ packages/billiard/trunk/debian/python-billiard.install	2014-02-12 12:56:02 UTC (rev 27619)
@@ -1 +0,0 @@
-usr/

Modified: packages/billiard/trunk/debian/rules
===================================================================
--- packages/billiard/trunk/debian/rules	2014-02-12 09:54:17 UTC (rev 27618)
+++ packages/billiard/trunk/debian/rules	2014-02-12 12:56:02 UTC (rev 27619)
@@ -3,14 +3,44 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PYVERS :=  $(shell pyversions -r)
+PY3VERS := $(shell py3versions -r)
+
 %:
-	dh $@ --with python2,sphinxdoc --buildsystem=python_distutils
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=python_distutils
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	dh_auto_build
+	set -e; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		$$py -B setup.py build; \
+	done
 	PYTHONPATH=. sphinx-build -b html -N Doc/ Doc/.build/html
 
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	set -e; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		$$py -B setup.py clean; \
+		rm -rf build; \
+	done
+	find -name __pycache__ | xargs rm -rf
+	find -name "*.pyc" -delete
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	set -e; \
+	for py in $(PYVERS); do \
+		$$py -B setup.py install --skip-build --root debian/python-billiard \
+		                      --install-layout deb; \
+	done
+	set -e; \
+	for py in $(PY3VERS); do \
+		$$py -B setup.py install --skip-build --root debian/python3-billiard \
+		                      --install-layout deb; \
+	done
+	rm debian/python*-billiard/usr/lib/python*/*-packages/billiard*.egg-info/SOURCES.txt
+
 .PHONY: override_dh_installchangelogs
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.txt
@@ -28,7 +58,7 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e; \
-	for py in $(PYVERS); do \
+	for py in $(PYVERS) $(PY3VERS); do \
 		$$py setup.py test ; \
 	done
 endif