[Python-modules-commits] r25596 - in packages/billiard/trunk/debian (14 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Thu Aug 15 18:27:02 UTC 2013
Date: Thursday, August 15, 2013 @ 18:27:00
Author: fladi-guest
Revision: 25596
Package latest upstream for reopened ITP (Closes: #571656).
Added:
packages/billiard/trunk/debian/patches/
packages/billiard/trunk/debian/patches/exclude_funtests_package.patch
packages/billiard/trunk/debian/patches/remove-nose-cover3.patch
packages/billiard/trunk/debian/patches/series
packages/billiard/trunk/debian/patches/spelling.patch
packages/billiard/trunk/debian/python-billiard-doc.doc-base
packages/billiard/trunk/debian/python-billiard-doc.docs
packages/billiard/trunk/debian/python-billiard.install
Modified:
packages/billiard/trunk/debian/changelog
packages/billiard/trunk/debian/clean
packages/billiard/trunk/debian/control
packages/billiard/trunk/debian/copyright
packages/billiard/trunk/debian/docs
packages/billiard/trunk/debian/rules
Modified: packages/billiard/trunk/debian/changelog
===================================================================
--- packages/billiard/trunk/debian/changelog 2013-08-15 18:02:52 UTC (rev 25595)
+++ packages/billiard/trunk/debian/changelog 2013-08-15 18:27:00 UTC (rev 25596)
@@ -1,6 +1,6 @@
billiard (2.7.3.31-1) UNRELEASED; urgency=low
- [ Fladischer Michael ]
+ [ Michael Fladischer ]
* Initial release (Closes: #571656)
[ Thomas Bechtold ]
@@ -10,4 +10,4 @@
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:00:32 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 01 Jul 2013 14:18:48 +0200
Modified: packages/billiard/trunk/debian/clean
===================================================================
--- packages/billiard/trunk/debian/clean 2013-08-15 18:02:52 UTC (rev 25595)
+++ packages/billiard/trunk/debian/clean 2013-08-15 18:27:00 UTC (rev 25596)
@@ -3,3 +3,4 @@
billiard.egg-info/PKG-INFO
billiard.egg-info/SOURCES.txt
billiard.egg-info/top_level.txt
+_billiard.so
Modified: packages/billiard/trunk/debian/control
===================================================================
--- packages/billiard/trunk/debian/control 2013-08-15 18:02:52 UTC (rev 25595)
+++ packages/billiard/trunk/debian/control 2013-08-15 18:27:00 UTC (rev 25596)
@@ -2,13 +2,16 @@
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Fladischer Michael <FladischerMichael at fladi.at>,
+Uploaders: Michael Fladischer <FladischerMichael at fladi.at>,
Thomas Bechtold <thomasbechtold at jpberlin.de>
Build-Depends: debhelper (>= 9),
python-all-dev (>= 2.6.6-3~),
- python-all-dbg,
+ python-mock,
+ python-nose,
python-setuptools,
-X-Python-Version: >= 2.7
+ python-unittest2
+Build-Depends-Indep: libjs-jquery, python-sphinx (>= 1.0.7+dfsg-1~)
+X-Python-Version: >= 2.4
Standards-Version: 3.9.4
Homepage: https://github.com/celery/billiard
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/billiard/trunk/
@@ -16,10 +19,20 @@
Package: python-billiard
Architecture: any
-Depends: ${python:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Suggests: python-billiard-doc
Description: Multiprocessing Pool Extensions for Python
This package contains extensions to the multiprocessing Pool.
- It extends the multiprocessing.Pool with a billiard.pool.DynamicPool
+ It extends the multiprocessing.Pool with a billiard.pool.DynamicPool
that can grow in size.
+
+Package: python-billiard-doc
+Section: doc
+Architecture: all
+Depends: libjs-jquery, ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Multiprocessing Pool Extensions for Python (Documentation)
+ 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 documentation.
Modified: packages/billiard/trunk/debian/copyright
===================================================================
--- packages/billiard/trunk/debian/copyright 2013-08-15 18:02:52 UTC (rev 25595)
+++ packages/billiard/trunk/debian/copyright 2013-08-15 18:27:00 UTC (rev 25596)
@@ -4,13 +4,17 @@
Source: http://pypi.python.org/pypi/billiard/
Files: *
-Copyright: 2006-2008, R Oudkerk
-License: BSD
+Copyright: 2010-2013, Ask Solem <ask at celeryproject.org>
+License: BSD-Ask-Solem
Files: billiard/connection.py
+ billiard/__init__.py
+ billiard/_connection.py
+ billiard/dummy/__init__.py
+ billiard/dummy/connection.py
billiard/forking.py
billiard/heap.py
- biliard/managers.py
+ billiard/managers.py
billiard/pool.py
billiard/process.py
billiard/queues.py
@@ -18,15 +22,27 @@
billiard/sharedctypes.py
billiard/synchronize.py
billiard/util.py
+ Doc/includes/mp_benchmarks.py
+ Doc/includes/mp_newtype.py
+ Doc/includes/mp_pool.py
+ Doc/includes/mp_synchronize.py
+ Doc/includes/mp_webserver.py
+ Doc/includes/mp_workers.py
+ Modules/_billiard/connection.h
+ Modules/_billiard/multiprocessing.c
+ Modules/_billiard/pipe_connection.c
+ Modules/_billiard/semaphore.c
+ Modules/_billiard/socket_connection.c
+ Modules/_billiard/win32_functions.c
License: PSF-2
Copyright: 2006-2008, R Oudkerk
Files: debian/*
-Copyright: 2010, Fladischer Michael
+Copyright: 2013, Michael Fladischer <FladischerMichael at fladi.at>
2012, Thomas Bechtold
-License: BSD
+License: BSD-Ask-Solem
-License: BSD
+License: BSD-Ask-Solem
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
@@ -38,7 +54,7 @@
.
Neither the name of Ask Solem nor the names of its contributors may be used
to endorse or promote products derived from this software without specific
- prior written permission.
+ prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -101,4 +117,3 @@
8. By copying, installing or otherwise using Python, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
-
Modified: packages/billiard/trunk/debian/docs
===================================================================
--- packages/billiard/trunk/debian/docs 2013-08-15 18:02:52 UTC (rev 25595)
+++ packages/billiard/trunk/debian/docs 2013-08-15 18:27:00 UTC (rev 25596)
@@ -1,2 +1 @@
-README
-TODO
+README.rst
Added: packages/billiard/trunk/debian/patches/exclude_funtests_package.patch
===================================================================
--- packages/billiard/trunk/debian/patches/exclude_funtests_package.patch (rev 0)
+++ packages/billiard/trunk/debian/patches/exclude_funtests_package.patch 2013-08-15 18:27:00 UTC (rev 25596)
@@ -0,0 +1,16 @@
+Description: Do not install install funtests package
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2013-07-01
+Forwarded: no
+
+--- a/setup.py
++++ b/setup.py
+@@ -202,7 +202,7 @@
+ version=meta['VERSION'],
+ description=meta['doc'],
+ long_description=long_description,
+- packages=find_packages(exclude=['ez_setup', 'tests', 'tests.*']),
++ packages=find_packages(exclude=['ez_setup', 'tests', 'tests.*', 'funtests', 'funtests.*']),
+ ext_modules=extensions,
+ author=meta['author'],
+ author_email=meta['author_email'],
Added: packages/billiard/trunk/debian/patches/remove-nose-cover3.patch
===================================================================
--- packages/billiard/trunk/debian/patches/remove-nose-cover3.patch (rev 0)
+++ packages/billiard/trunk/debian/patches/remove-nose-cover3.patch 2013-08-15 18:27:00 UTC (rev 25596)
@@ -0,0 +1,26 @@
+Description: Remove pretty-printing nose-cover3 from build.
+ nose-cover3 is not essential to the build-proccess and is not packaged
+ for Debian. Thus removing it from the sources.
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2013-07-01
+Forwared: not-needed
+
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,9 +1,5 @@
+ [nosetests]
+ where = billiard/tests
+-cover3-branch = 1
+-cover3-html = 1
+-cover3-package = billiard
+-cover3-exclude = billiard.tests
+
+ [egg_info]
+ tag_build =
+--- a/requirements/test.txt
++++ b/requirements/test.txt
+@@ -1,4 +1,3 @@
+ unittest2>=0.4.0
+ nose
+-nose-cover3
+ mock
Added: packages/billiard/trunk/debian/patches/series
===================================================================
--- packages/billiard/trunk/debian/patches/series (rev 0)
+++ packages/billiard/trunk/debian/patches/series 2013-08-15 18:27:00 UTC (rev 25596)
@@ -0,0 +1,3 @@
+spelling.patch
+remove-nose-cover3.patch
+exclude_funtests_package.patch
Added: packages/billiard/trunk/debian/patches/spelling.patch
===================================================================
--- packages/billiard/trunk/debian/patches/spelling.patch (rev 0)
+++ packages/billiard/trunk/debian/patches/spelling.patch 2013-08-15 18:27:00 UTC (rev 25596)
@@ -0,0 +1,16 @@
+Description: Fix spelling error in upstream
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2013-07-01
+Forwarded: no
+
+--- a/Modules/_billiard/multiprocessing.c
++++ b/Modules/_billiard/multiprocessing.c
+@@ -68,7 +68,7 @@
+ break;
+ default:
+ PyErr_Format(PyExc_RuntimeError,
+- "unkown error number %d", num);
++ "unknown error number %d", num);
+ }
+ return NULL;
+ }
Added: packages/billiard/trunk/debian/python-billiard-doc.doc-base
===================================================================
--- packages/billiard/trunk/debian/python-billiard-doc.doc-base (rev 0)
+++ packages/billiard/trunk/debian/python-billiard-doc.doc-base 2013-08-15 18:27:00 UTC (rev 25596)
@@ -0,0 +1,9 @@
+Document: python-billiard-doc
+Title: Python Billiard Documentation
+Author: Ask Solem
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-billiard-doc/html/index.html
+Files: /usr/share/doc/python-billiard-doc/html/*.html
+ /usr/share/doc/python-billiard-doc/html/library/*.html
Added: packages/billiard/trunk/debian/python-billiard-doc.docs
===================================================================
--- packages/billiard/trunk/debian/python-billiard-doc.docs (rev 0)
+++ packages/billiard/trunk/debian/python-billiard-doc.docs 2013-08-15 18:27:00 UTC (rev 25596)
@@ -0,0 +1,2 @@
+Doc/.build/html
+
Added: packages/billiard/trunk/debian/python-billiard.install
===================================================================
--- packages/billiard/trunk/debian/python-billiard.install (rev 0)
+++ packages/billiard/trunk/debian/python-billiard.install 2013-08-15 18:27:00 UTC (rev 25596)
@@ -0,0 +1 @@
+usr/
Modified: packages/billiard/trunk/debian/rules
===================================================================
--- packages/billiard/trunk/debian/rules 2013-08-15 18:02:52 UTC (rev 25595)
+++ packages/billiard/trunk/debian/rules 2013-08-15 18:27:00 UTC (rev 25596)
@@ -1,28 +1,39 @@
#!/usr/bin/make -f
-# -*- makefile -*-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-#PYVERS := $(shell pyversions -r)
-
%:
- dh $@ --with python2 --buildsystem=python_distutils
+ dh $@ --with python2,sphinxdoc --buildsystem=python_distutils
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+ dh_auto_build
+ PYTHONPATH=. sphinx-build -b html -N Doc/ Doc/.build/html
+
+.PHONY: override_dh_installdocs
override_dh_installdocs:
- dh_installdocs -XREADME -XTODO -a
+ dh_installdocs -XREADME -XTODO -A
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
+ dh_installchangelogs CHANGES.txt
-#TODO: enable testsuite - but more debian packages needed for that (eg. nose-cover3)
-#override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-# set -ex; \
-# for py in $(PYVERS); do \
-# $$py setup.py test; \
-# done
-#endif
+.PHONY: override_dh_compress
+override_dh_compress:
+ dh_compress -X.js -X.html -X.txt
+.PHONY: override_dh_clean
+override_dh_clean:
+ dh_clean
+ rm -rf Doc/.build
-override_dh_auto_clean:
- rm -rf dist build setup.cfg PKG-INFO billiard.egg-info
- find -name '*\.py[co]' -delete
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py setup.py test ; \
+ done
+endif
+
More information about the Python-modules-commits
mailing list