[Python-modules-commits] r30143 - in packages/celery/trunk/debian (12 files)
bam at users.alioth.debian.org
bam at users.alioth.debian.org
Wed Aug 13 02:34:04 UTC 2014
Date: Wednesday, August 13, 2014 @ 02:34:03
Author: bam
Revision: 30143
Python 3 package.
Added:
packages/celery/trunk/debian/patches/fix_tests
packages/celery/trunk/debian/python-celery-common.install
packages/celery/trunk/debian/wrappers/
packages/celery/trunk/debian/wrappers/celery
packages/celery/trunk/debian/wrappers/celerybeat
packages/celery/trunk/debian/wrappers/celeryd
packages/celery/trunk/debian/wrappers/celeryd-multi
Modified:
packages/celery/trunk/debian/changelog
packages/celery/trunk/debian/control
packages/celery/trunk/debian/patches/series
packages/celery/trunk/debian/rules
Deleted:
packages/celery/trunk/debian/python-celery.install
Modified: packages/celery/trunk/debian/changelog
===================================================================
--- packages/celery/trunk/debian/changelog 2014-08-12 21:31:20 UTC (rev 30142)
+++ packages/celery/trunk/debian/changelog 2014-08-13 02:34:03 UTC (rev 30143)
@@ -1,9 +1,14 @@
-celery (3.1.12-2) UNRELEASED; urgency=medium
+celery (3.1.12-2) unstable; urgency=medium
+ [ Michael Fladischer ]
* Drop python-cl from Depends and Build-Depends as it is no longer needed.
- -- Michael Fladischer <FladischerMichael at fladi.at> Fri, 11 Jul 2014 14:13:27 +0200
+ [ Brian May ]
+ * Python3 package. Closes: #753555.
+ * Change certificate test, as test certificate has expired. Closes: #757897.
+ -- Brian May <bam at debian.org> Wed, 13 Aug 2014 12:13:59 +1000
+
celery (3.1.12-1) unstable; urgency=low
* New upstream release.
Modified: packages/celery/trunk/debian/control
===================================================================
--- packages/celery/trunk/debian/control 2014-08-12 21:31:20 UTC (rev 30142)
+++ packages/celery/trunk/debian/control 2014-08-13 02:34:03 UTC (rev 30143)
@@ -2,33 +2,26 @@
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 8.1.0~),
- docbook-to-man,
- dvipng,
- locales,
- texlive-latex-base,
- texlive-latex-extra,
- python-all (>= 2.7),
- python-billiard (>= 3.3.0.17),
- python-dateutil (>= 1.5),
- python-doc,
- python-gevent,
- python-kombu (>= 3.0.19),
- python-kombu-doc (>= 3.0.19),
- python-mailer,
- python-memcache,
- python-mock (>= 1.0.1),
- python-nose,
- python-openssl,
- python-pyparsing,
- python-pytyrant,
- python-redis,
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg),
- python-sqlalchemy,
- python-tz,
- python-unittest2
+Uploaders: Michael Fladischer <FladischerMichael at fladi.at>,
+ Brian May <bam at debian.org>
+Build-Depends: debhelper (>= 8.1.0~), dh-python,
+ docbook-to-man, dvipng, locales, texlive-latex-base, texlive-latex-extra,
+ python-all (>= 2.7), python-billiard (>= 3.3.0.17),
+ python-dateutil (>= 1.5), python-doc,
+ python-kombu (>= 3.0.19), python-kombu-doc (>= 3.0.19),
+ python-memcache, python-mock (>= 1.0.1), python-nose,
+ python-openssl, python-pyparsing,
+ python-redis, python-setuptools, python-sphinx (>= 1.0.7+dfsg),
+ python-sqlalchemy, python-tz, python-unittest2,
+ python-gevent, python-mailer, python-pytyrant,
+ python3-all, python3-billiard (>= 3.3.0.17),
+ python3-dateutil (>= 1.5), python3-doc,
+ python3-kombu (>= 3.0.19), python-kombu-doc (>= 3.0.19),
+ python3-memcache, python3-mock (>= 1.0.1), python3-nose,
+ python3-openssl, python3-pyparsing,
+ python3-redis, python3-setuptools, python3-sphinx (>= 1.0.7+dfsg),
+ python3-sqlalchemy, python3-tz,
+# python3-gevent, python3-mailer, python3-pytyrant,
X-Python-Version: >= 2.7
XS-Testsuite: autopkgtest
Standards-Version: 3.9.5
@@ -36,6 +29,28 @@
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/celery/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/celery/trunk/
+Package: python-celery-common
+Depends: ${misc:Depends}
+Architecture: all
+Description: async task/job queue based on message passing
+ Celery is an open source asynchronous task queue/job queue based on
+ distributed message passing. It is focused on real-time operation,
+ but supports scheduling as well.
+ .
+ The execution units, called tasks, are executed concurrently on one
+ or more worker nodes. Tasks can execute asynchronously (in the
+ background) or synchronously (wait until ready).
+ .
+ Celery is written in Python, but the protocol can be implemented
+ in any language. It can also operate with other languages using
+ webhooks.
+ .
+ The recommended message broker is RabbitMQ, but limited support for Redis,
+ Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
+ ORM) is also available. Celery is easy to integrate with Django, using the
+ python-django-celery package.
+
+
Package: python-celery
Architecture: all
Depends: python-billiard (>= 3.3.0.17),
@@ -46,6 +61,7 @@
python-pkg-resources,
python-pyparsing,
python-tz,
+ python-celery-common (= ${binary:Version}),
${misc:Depends},
${python:Depends}
Suggests: python-gevent, python-pytyrant, python-redis, python-sqlalchemy, python-celery-doc
@@ -67,6 +83,37 @@
ORM) is also available. Celery is easy to integrate with Django, using the
python-django-celery package.
+Package: python3-celery
+Architecture: all
+Depends: python3-billiard (>= 3.3.0.17),
+ python3-dateutil (>= 1.5),
+ python3-kombu (>= 3.0.19),
+# python3-mailer,
+ python3-memcache,
+ python3-pkg-resources,
+ python3-pyparsing,
+ python3-tz,
+ ${misc:Depends},
+ ${python3:Depends}
+Suggests: python3-gevent, python3-pytyrant, python3-redis, python3-sqlalchemy, python-celery-doc
+Description: async task/job queue based on message passing
+ Celery is an open source asynchronous task queue/job queue based on
+ distributed message passing. It is focused on real-time operation,
+ but supports scheduling as well.
+ .
+ The execution units, called tasks, are executed concurrently on one
+ or more worker nodes. Tasks can execute asynchronously (in the
+ background) or synchronously (wait until ready).
+ .
+ Celery is written in Python, but the protocol can be implemented
+ in any language. It can also operate with other languages using
+ webhooks.
+ .
+ The recommended message broker is RabbitMQ, but limited support for Redis,
+ Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
+ ORM) is also available. Celery is easy to integrate with Django, using the
+ python-django-celery package.
+
Package: python-celery-doc
Section: doc
Architecture: all
Added: packages/celery/trunk/debian/patches/fix_tests
===================================================================
--- packages/celery/trunk/debian/patches/fix_tests (rev 0)
+++ packages/celery/trunk/debian/patches/fix_tests 2014-08-13 02:34:03 UTC (rev 30143)
@@ -0,0 +1,13 @@
+Index: celery/celery/tests/security/test_certificate.py
+===================================================================
+--- celery.orig/celery/tests/security/test_certificate.py 2014-08-13 11:41:27.028556353 +1000
++++ celery/celery/tests/security/test_certificate.py 2014-08-13 11:41:54.659917069 +1000
+@@ -23,7 +23,7 @@
+ self.assertRaises(SecurityError, Certificate, KEY1)
+
+ def test_has_expired(self):
+- self.assertFalse(Certificate(CERT1).has_expired())
++ self.assertTrue(Certificate(CERT1).has_expired())
+
+
+ class test_CertStore(SecurityCase):
Modified: packages/celery/trunk/debian/patches/series
===================================================================
--- packages/celery/trunk/debian/patches/series 2014-08-12 21:31:20 UTC (rev 30142)
+++ packages/celery/trunk/debian/patches/series 2014-08-13 02:34:03 UTC (rev 30143)
@@ -3,3 +3,4 @@
intersphinx.patch
disable_unstable_tests.patch
privacy.patch
+fix_tests
Added: packages/celery/trunk/debian/python-celery-common.install
===================================================================
--- packages/celery/trunk/debian/python-celery-common.install (rev 0)
+++ packages/celery/trunk/debian/python-celery-common.install 2014-08-13 02:34:03 UTC (rev 30143)
@@ -0,0 +1,4 @@
+debian/wrappers/celery usr/bin/
+debian/wrappers/celerybeat usr/bin/
+debian/wrappers/celeryd usr/bin/
+debian/wrappers/celeryd-multi usr/bin/
Deleted: packages/celery/trunk/debian/python-celery.install
===================================================================
--- packages/celery/trunk/debian/python-celery.install 2014-08-12 21:31:20 UTC (rev 30142)
+++ packages/celery/trunk/debian/python-celery.install 2014-08-13 02:34:03 UTC (rev 30143)
@@ -1 +0,0 @@
-usr/
Modified: packages/celery/trunk/debian/rules
===================================================================
--- packages/celery/trunk/debian/rules 2014-08-12 21:31:20 UTC (rev 30142)
+++ packages/celery/trunk/debian/rules 2014-08-13 02:34:03 UTC (rev 30143)
@@ -1,7 +1,13 @@
#!/usr/bin/make -f
+PREFIX = debian/python-celery
+PREFIX3 = debian/python3-celery
+PREFIXC = debian/python-celery-common
+
+export PYBUILD_NAME=celery
+
%:
- dh $@ --with python2,sphinxdoc
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
.PHONY: override_dh_installman
override_dh_installman:
@@ -25,6 +31,11 @@
rm -f test.db ; \
PYTHONPATH=. LC_ALL=C.UTF-8 $$python setup.py test ; \
done
+ set -e; \
+ for python in $(shell py3versions -r); do \
+ rm -f test.db ; \
+ PYTHONPATH=. LC_ALL=C.UTF-8 $$python setup.py test ; \
+ done
endif
#.PHONY: override_dh_compress
@@ -36,6 +47,28 @@
rm -rf .build
dh_clean
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+ dh_auto_install
+
+ set e; for FILENAME in celery celerybeat celeryd celeryd-multi; do \
+ rm $(PREFIX)/usr/bin/$$FILENAME; \
+ rm $(PREFIX3)/usr/bin/$$FILENAME; \
+ done
+ rmdir --ignore-fail-on-non-empty --parents $(PREFIX)/usr/bin $(PREFIX3)/usr/bin
+
+
+.PHONY: override_dh_install
+override_dh_install:
+ dh_install
+
+ # Fix permissions
+ set e; for FILENAME in celery celerybeat celeryd celeryd-multi; do \
+ chmod 755 $(PREFIXC)/usr/bin/$$FILENAME; \
+ done
+
+
.PHONY: override_dh_installinit
override_dh_installinit:
ln extra/generic-init.d/celerybeat debian/celeryd.celerybeat.init
Added: packages/celery/trunk/debian/wrappers/celery
===================================================================
--- packages/celery/trunk/debian/wrappers/celery (rev 0)
+++ packages/celery/trunk/debian/wrappers/celery 2014-08-13 02:34:03 UTC (rev 30143)
@@ -0,0 +1,29 @@
+#!/bin/sh
+shell_code=''' '
+# shell code
+if command -v python3 > /dev/null && test -e /usr/lib/python3/dist-packages/celery
+then
+ exec python3 "$0" "$@"
+elif command -v python2.7 > /dev/null && test -e /usr/lib/python2.7/dist-packages/celery
+then
+ exec python2.7 "$0" "$@"
+elif command -v python2.6 > /dev/null && test -e /usr/lib/python2.6/dist-packages/celery
+then
+ exec python2.6 "$0" "$@"
+else
+ echo "Cannot find installed version of python-django or python3-django." >&2
+ exit 1
+fi
+
+python_code='''
+# python code
+# ONLY use DOUBLE quotes <"> after this line
+__requires__ = "celery==3.1.12"
+import sys
+from pkg_resources import load_entry_point
+
+if __name__ == "__main__":
+ sys.exit(
+ load_entry_point("celery==3.1.12", "console_scripts", "celery")()
+ )
+# End of Python code. Do not modify this line. #'
Added: packages/celery/trunk/debian/wrappers/celerybeat
===================================================================
--- packages/celery/trunk/debian/wrappers/celerybeat (rev 0)
+++ packages/celery/trunk/debian/wrappers/celerybeat 2014-08-13 02:34:03 UTC (rev 30143)
@@ -0,0 +1,29 @@
+#!/bin/sh
+shell_code=''' '
+# shell code
+if command -v python3 > /dev/null && test -e /usr/lib/python3/dist-packages/celery
+then
+ exec python3 "$0" "$@"
+elif command -v python2.7 > /dev/null && test -e /usr/lib/python2.7/dist-packages/celery
+then
+ exec python2.7 "$0" "$@"
+elif command -v python2.6 > /dev/null && test -e /usr/lib/python2.6/dist-packages/celery
+then
+ exec python2.6 "$0" "$@"
+else
+ echo "Cannot find installed version of python-django or python3-django." >&2
+ exit 1
+fi
+
+python_code='''
+# python code
+# ONLY use DOUBLE quotes <"> after this line
+__requires__ = "celery==3.1.12"
+import sys
+from pkg_resources import load_entry_point
+
+if __name__ == "__main__":
+ sys.exit(
+ load_entry_point("celery==3.1.12", "console_scripts", "celerybeat")()
+ )
+# End of Python code. Do not modify this line. #'
Added: packages/celery/trunk/debian/wrappers/celeryd
===================================================================
--- packages/celery/trunk/debian/wrappers/celeryd (rev 0)
+++ packages/celery/trunk/debian/wrappers/celeryd 2014-08-13 02:34:03 UTC (rev 30143)
@@ -0,0 +1,29 @@
+#!/bin/sh
+shell_code=''' '
+# shell code
+if command -v python3 > /dev/null && test -e /usr/lib/python3/dist-packages/celery
+then
+ exec python3 "$0" "$@"
+elif command -v python2.7 > /dev/null && test -e /usr/lib/python2.7/dist-packages/celery
+then
+ exec python2.7 "$0" "$@"
+elif command -v python2.6 > /dev/null && test -e /usr/lib/python2.6/dist-packages/celery
+then
+ exec python2.6 "$0" "$@"
+else
+ echo "Cannot find installed version of python-django or python3-django." >&2
+ exit 1
+fi
+
+python_code='''
+# python code
+# ONLY use DOUBLE quotes <"> after this line
+__requires__ = "celery==3.1.12"
+import sys
+from pkg_resources import load_entry_point
+
+if __name__ == "__main__":
+ sys.exit(
+ load_entry_point("celery==3.1.12", "console_scripts", "celeryd")()
+ )
+# End of Python code. Do not modify this line. #'
Added: packages/celery/trunk/debian/wrappers/celeryd-multi
===================================================================
--- packages/celery/trunk/debian/wrappers/celeryd-multi (rev 0)
+++ packages/celery/trunk/debian/wrappers/celeryd-multi 2014-08-13 02:34:03 UTC (rev 30143)
@@ -0,0 +1,29 @@
+#!/bin/sh
+shell_code=''' '
+# shell code
+if command -v python3 > /dev/null && test -e /usr/lib/python3/dist-packages/celery
+then
+ exec python3 "$0" "$@"
+elif command -v python2.7 > /dev/null && test -e /usr/lib/python2.7/dist-packages/celery
+then
+ exec python2.7 "$0" "$@"
+elif command -v python2.6 > /dev/null && test -e /usr/lib/python2.6/dist-packages/celery
+then
+ exec python2.6 "$0" "$@"
+else
+ echo "Cannot find installed version of python-django or python3-django." >&2
+ exit 1
+fi
+
+python_code='''
+# python code
+# ONLY use DOUBLE quotes <"> after this line
+__requires__ = "celery==3.1.12"
+import sys
+from pkg_resources import load_entry_point
+
+if __name__ == "__main__":
+ sys.exit(
+ load_entry_point("celery==3.1.12", "console_scripts", "celeryd")()
+ )
+# End of Python code. Do not modify this line. #'
More information about the Python-modules-commits
mailing list