[Python-modules-commits] r25194 - in packages/celery/tags (16 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Mon Jul 15 11:59:39 UTC 2013
Date: Monday, July 15, 2013 @ 11:59:36
Author: fladi-guest
Revision: 25194
[svn-buildpackage] Tagging celery 3.0.21-1
Added:
packages/celery/tags/3.0.21-1/
packages/celery/tags/3.0.21-1/debian/celeryd.celeryd.default
(from rev 25051, packages/celery/branches/wheezy/debian/python-celery.celeryd.default)
packages/celery/tags/3.0.21-1/debian/manpage.celery.sgml
packages/celery/tags/3.0.21-1/debian/patches/drop_downgrade.patch
Modified:
packages/celery/tags/3.0.21-1/debian/changelog
packages/celery/tags/3.0.21-1/debian/clean
packages/celery/tags/3.0.21-1/debian/control
packages/celery/tags/3.0.21-1/debian/patches/fix_dependencies.patch
packages/celery/tags/3.0.21-1/debian/patches/intersphinx.patch
packages/celery/tags/3.0.21-1/debian/patches/lsb-init.patch
packages/celery/tags/3.0.21-1/debian/patches/series
packages/celery/tags/3.0.21-1/debian/python-celery-doc.doc-base
packages/celery/tags/3.0.21-1/debian/python-celery.docs
packages/celery/tags/3.0.21-1/debian/python-celery.manpages
packages/celery/tags/3.0.21-1/debian/rules
Deleted:
packages/celery/tags/3.0.21-1/debian/python-celery.celeryd.default
Copied: packages/celery/tags/3.0.21-1/debian/celeryd.celeryd.default (from rev 25051, packages/celery/branches/wheezy/debian/python-celery.celeryd.default)
===================================================================
--- packages/celery/tags/3.0.21-1/debian/celeryd.celeryd.default (rev 0)
+++ packages/celery/tags/3.0.21-1/debian/celeryd.celeryd.default 2013-07-15 11:59:36 UTC (rev 25194)
@@ -0,0 +1,35 @@
+# Edit the options in this file to match your projects environment.
+# See http://ask.github.com/celery/cookbook/daemonizing.html for the complete
+# documentation on the options.
+
+# WARNING: This script is only designed to run the worker(s) for a single
+# project. If you need to start workers for multiple projects you should
+# consider using supervisor.
+# Examples can be found in /usr/share/doc/python-celery/supervisord/
+
+# Change this to true when done to enable the init.d script.
+# Default: false
+ENABLED="false"
+
+# Name of nodes to start
+# here we have a single node
+CELERYD_NODES="w1"
+# or we could have three nodes:
+#CELERYD_NODES="w1 w2 w3"
+
+# Where to chdir at start.
+CELERYD_CHDIR="/opt/Myproject/"
+
+# Extra arguments to celeryd
+CELERYD_OPTS="--time-limit=300 --concurrency=8"
+
+# Name of the celery config module.
+CELERY_CONFIG_MODULE="celeryconfig"
+
+# %n will be replaced with the nodename.
+CELERYD_LOG_FILE="/var/log/celery/%n.log"
+CELERYD_PID_FILE="/var/run/celery/%n.pid"
+
+# Workers should run as an unprivileged user.
+CELERYD_USER="celery"
+CELERYD_GROUP="celery"
Modified: packages/celery/tags/3.0.21-1/debian/changelog
===================================================================
--- packages/celery/branches/wheezy/debian/changelog 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/changelog 2013-07-15 11:59:36 UTC (rev 25194)
@@ -1,3 +1,30 @@
+celery (3.0.21-1) unstable; urgency=low
+
+ * New upstream release.
+ * Move init scripts to the separate celeryd package.
+ - Correctly name symlinks during build.
+ - Clean up correct smylinks.
+ * Bump Build-Depends on debhelper to >= 8.1.0 to satisfy build-arch
+ and build-indep targets.
+ * Bump Standards version to 3.9.4.
+ * Add versioned dependency on python-billiard.
+ * Add dependency on python-tz.
+ * Add build dependency on python-openssl to enable more tests.
+ * Bump dependency on python-kombu(-doc) to >= 2.5.11.
+ * Drop depenceny on python-amqplib, it has been replaced by
+ python-amqp/python-librabbitmq in python-kombu.
+ * Drop dependency on python-anyjson, as it is required by python-kombu which
+ already has it set as a versioned dependency.
+ * Refresh patches.
+ * Install supervisord and init scripts from extra instead of contrib.
+ * Install upstream changelog.
+ * Adapt filenames in d/docs to new upstream names.
+ * Update directories in doc-base.
+ * python-celery suggests python-celery-doc.
+ * Use canonical URIs for Vcs-* fields.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Tue, 02 Jul 2013 13:31:25 +0200
+
celery (2.5.3-4) unstable; urgency=low
* Unconditionally remove /var/log/celery on purge.
Modified: packages/celery/tags/3.0.21-1/debian/clean
===================================================================
--- packages/celery/branches/wheezy/debian/clean 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/clean 2013-07-15 11:59:36 UTC (rev 25194)
@@ -4,7 +4,8 @@
celeryd-multi.1
celeryev.1
camqadm.1
+celery.1
celery.egg-info/PKG-INFO
celery.egg-info/SOURCES.txt
celery.egg-info/requires.txt
-debian/python-celery.*.init
+debian/celeryd.*.init
Modified: packages/celery/tags/3.0.21-1/debian/control
===================================================================
--- packages/celery/branches/wheezy/debian/control 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/control 2013-07-15 11:59:36 UTC (rev 25194)
@@ -3,52 +3,53 @@
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 (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.0~),
docbook-to-man,
dvipng,
texlive-latex-base,
texlive-latex-extra,
python-all (>= 2.7),
- python-amqplib,
- python-anyjson (>= 0.3.1),
+ python-billiard (>= 2.7.3.31),
python-cl,
python-dateutil (>= 1.5),
python-doc,
python-gevent,
- python-kombu (>= 2.1.5),
- python-kombu-doc (>= 2.1.5),
+ python-kombu (>= 2.5.11),
+ python-kombu-doc (>= 2.5.11),
python-mailer,
python-memcache,
python-mock,
python-nose,
+ python-openssl,
python-pyparsing,
python-pytyrant,
python-redis,
python-setuptools,
python-sphinx (>= 1.0.7+dfsg),
python-sphinxcontrib.issuetracker,
- python-sqlalchemy
+ python-sqlalchemy,
+ python-tz
X-Python-Version: >= 2.7
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://github.com/ask/celery/
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/celery/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/celery/trunk/
+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
Architecture: all
Depends: adduser,
- python-amqplib,
- python-anyjson (>= 0.3.1),
+ python-billiard (>= 2.7.3.31),
python-cl,
python-dateutil (>= 1.5),
- python-kombu (>= 2.1.5),
+ python-kombu (>= 2.5.11),
python-mailer,
python-memcache,
python-pkg-resources,
python-pyparsing,
+ python-tz,
${misc:Depends},
${python:Depends}
-Suggests: python-gevent, python-pytyrant, python-redis, python-sqlalchemy
+Suggests: python-gevent, python-pytyrant, python-redis, python-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,
@@ -90,3 +91,27 @@
python-django-celery package.
.
This package contains the documentation.
+
+Package: celeryd
+Architecture: all
+Depends: python-celery (= ${binary:Version}), ${misc:Depends}
+Suggests: rabbitmq-server
+Description: async task/job queue based on message passing (daemons)
+ 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.
+ .
+ This package contains the init scripts to start the celery daemons.
Added: packages/celery/tags/3.0.21-1/debian/manpage.celery.sgml
===================================================================
--- packages/celery/tags/3.0.21-1/debian/manpage.celery.sgml (rev 0)
+++ packages/celery/tags/3.0.21-1/debian/manpage.celery.sgml 2013-07-15 11:59:36 UTC (rev 25194)
@@ -0,0 +1,354 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+docbook-to-man $< > $@
+
+
+The docbook-to-man binary is found in the docbook-to-man package.
+Please remember that if you create the nroff version in one of the
+debian/rules file targets (such as build), you will need to include
+docbook-to-man in your Build-Depends control field.
+
+-->
+
+<!-- Fill in your name for FIRSTNAME and SURNAME. -->
+<!ENTITY dhfirstname "<firstname>Michael</firstname>">
+<!ENTITY dhsurname "<surname>Fladischer</surname>">
+<!-- Please adjust the date whenever revising the manpage. -->
+<!ENTITY dhdate "<date>12 July 2013</date>">
+<!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+allowed: see man(7), man(1). -->
+<!ENTITY dhsection "<manvolnum>1</manvolnum>">
+<!ENTITY dhemail "<email>FladischerMichael at fladi.at</email>">
+<!ENTITY dhusername "fladi">
+<!ENTITY dhucpackage "<refentrytitle>CELERY</refentrytitle>">
+<!ENTITY dhpackage "celery">
+
+<!ENTITY debian "<productname>Debian</productname>">
+<!ENTITY gnu "<acronym>GNU</acronym>">
+<!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2013</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>Celery Worker Daemon</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+ <arg>command</arg>
+
+ <arg><option>-A/--app=<replaceable>APP</replaceable></option></arg>
+ <arg><option>-b/--broker=<replaceable>BROKER</replaceable></option></arg>
+ <arg><option>--loader=<replaceable>LOADER</replaceable></option></arg>
+ <arg><option>--config=<replaceable>CONFIG</replaceable></option></arg>
+ <arg><option>--workdir=<replaceable>WORKING_DIRECTORY</replaceable></option></arg>
+ <arg><option>-q/--quiet</option></arg>
+ <arg><option>-C/--no-color</option></arg>
+ <arg><option>--version</option></arg>
+ <arg><option>--help</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> command.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.</para>
+
+ <para>
+ <command>&dhpackage;</command> is a program that manages the
+ Celery Worker Daemons and their queues.
+ </para>
+
+ </refsect1>
+ <refsect1>
+ <title>COMMANDS</title>
+ <para>
+ All inspect commands supports a --timeout argument, This is the number of seconds to wait for responses. You may have to increase this timeout if
+ you’re not getting a response due to latency.
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <arg>shell</arg>
+ </term>
+ <listitem>
+ <para>
+ Drop into a Python shell. The locals will include the celery variable, which is the current app. Also all known tasks will be
+ automatically added to locals (unless the --without-tasks flag is set). Uses Ipython, bpython, or regular python in that order if
+ installed. You can force an implementation using --force-ipython|-I, --force-bpython|-B, or --force-python|-P.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>status</arg>
+ </term>
+ <listitem>
+ <para>
+ List active nodes in this cluster.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>result <option>-t <replaceable>task name</replaceable></option> <replaceable>uuid</replaceable></arg>
+ </term>
+ <listitem>
+ <para>
+ Show the result of a task. Note that you can omit the name of the task as long as the task doesn’t use a custom result backend.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>purge</arg>
+ </term>
+ <listitem>
+ <para>
+ Purge messages from all configured task queues.
+ Warning: There is no undo for this operation, and messages will be permanently deleted!
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>inspect active</arg>
+ </term>
+ <listitem>
+ <para>
+ List active tasks. These are all the tasks that are currently being executed.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>inspect scheduled</arg>
+ </term>
+ <listitem>
+ <para>
+ List scheduled ETA tasks. These are tasks reserved by the worker because they have the eta or countdown argument set.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>inspect reserved</arg>
+ </term>
+ <listitem>
+ <para>
+ List reserved tasks. This will list all tasks that have been prefetched by the worker, and is currently waiting to be executed (does not
+ include tasks with an eta).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>inspect revoked</arg>
+ </term>
+ <listitem>
+ <para>
+ List history of revoked tasks.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>inspect registered</arg>
+ </term>
+ <listitem>
+ <para>
+ List registered tasks.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>inspect stats</arg>
+ </term>
+ <listitem>
+ <para>
+ Show worker statistics.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>control enable_events</arg>
+ </term>
+ <listitem>
+ <para>
+ Enable events.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>control disable_events</arg>
+ </term>
+ <listitem>
+ <para>
+ Disable events.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <arg>migrate <replaceable>from</replaceable> <replaceable>to</replaceable></arg>
+ </term>
+ <listitem>
+ <para>
+ Migrate tasks from one broker to another (EXPERIMENTAL). This command will migrate all the tasks on one broker to another. As this
+ command is new and experimental you should be sure to have a backup of the data before proceeding. The value for each broker should be
+ a URL.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <para>This program follows the usual &gnu; command line syntax,
+ with long options starting with two dashes (`-'). A summary of
+ options is included below.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>-A <replaceable class="parameter">APP</replaceable></option>
+ <option>--app=<replaceable class="parameter">APP</replaceable></option>
+ </term>
+ <listitem>
+ <para>App instance to use (e.g. module.attr_name).</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>-b <replaceable class="parameter">BROKER</replaceable></option>
+ <option>--broker=<replaceable class="parameter">BROKER</replaceable></option>
+ </term>
+ <listitem>
+ <para>URL to the broker. Default is 'amqp://guest@localhost//'.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--loader=<replaceable class="parameter">LOADER</replaceable></option>
+ </term>
+ <listitem>
+ <para>name of custom loader class to use.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--config=<replaceable class="parameter">CONFIG</replaceable></option>
+ </term>
+ <listitem>
+ <para>Name of the configuration module.</para>
+ </listitem>
+ </varlistentry><varlistentry>
+ <term>
+ <option>--workdir=<replaceable class="parameter">WORKING_DIRECTORY</replaceable></option>
+ </term>
+ <listitem>
+ <para>Optional directory to change to after detaching.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--quiet</option>
+ </term>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>-C</option>
+ <option>--no-color</option>
+ </term>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--version</option>
+ </term>
+ <listitem>
+ <para>Show program's version number and exit.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>-h</option>
+ <option>--help</option>
+ </term>
+ <listitem>
+ <para>Show help message and exit.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>celeryd(1), celerybeat (1), celeryctl (1).</para>
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>This manual page was written by &dhusername; &dhemail; for
+ the &debian; system (and may be used by others). Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the &gnu; General Public License, Version 2 any
+ later version published by the Free Software Foundation.
+ </para>
+ <para>
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL.
+ </para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
Added: packages/celery/tags/3.0.21-1/debian/patches/drop_downgrade.patch
===================================================================
--- packages/celery/tags/3.0.21-1/debian/patches/drop_downgrade.patch (rev 0)
+++ packages/celery/tags/3.0.21-1/debian/patches/drop_downgrade.patch 2013-07-15 11:59:36 UTC (rev 25194)
@@ -0,0 +1,35 @@
+--- a/setup.py
++++ b/setup.py
+@@ -20,32 +20,6 @@
+ if sys.version_info < (2, 5):
+ raise Exception('Celery requires Python 2.5 or higher.')
+
+-try:
+- orig_path = sys.path[:]
+- for path in (os.path.curdir, os.getcwd()):
+- if path in sys.path:
+- sys.path.remove(path)
+- try:
+- import celery.app
+- import imp
+- import shutil
+- _, task_path, _ = imp.find_module('task', celery.app.__path__)
+- if task_path.endswith('/task'):
+- print('- force upgrading previous installation')
+- print(' - removing %r package...' % task_path)
+- try:
+- shutil.rmtree(os.path.abspath(task_path))
+- except Exception:
+- sys.stderr.write('Could not remove %r: %r\n' % (
+- task_path, sys.exc_info[1]))
+- except ImportError:
+- print('Upgrade: no old version found.')
+- finally:
+- sys.path[:] = orig_path
+-except:
+- pass
+-
+-
+ NAME = 'celery'
+ entrypoints = {}
+ extra = {}
Modified: packages/celery/tags/3.0.21-1/debian/patches/fix_dependencies.patch
===================================================================
--- packages/celery/branches/wheezy/debian/patches/fix_dependencies.patch 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/patches/fix_dependencies.patch 2013-07-15 11:59:36 UTC (rev 25194)
@@ -2,56 +2,25 @@
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: 2011-11-28
+Last-Update: 2013-07-01
Forwared: not-needed
--- a/setup.cfg
+++ b/setup.cfg
-@@ -1,36 +1,5 @@
+@@ -1,9 +1,5 @@
[nosetests]
where = celery/tests
-cover3-branch = 1
-cover3-html = 1
-cover3-package = celery
--cover3-exclude = celery
-- celery.tests.*
-- celery.bin.celeryd_multi
-- celery.bin.celeryd_detach
-- celery.bin.celeryctl
-- celery.bin.camqadm
-- celery.execute
-- celery.local
-- celery.platforms
-- celery.utils.encoding
-- celery.utils.patch
-- celery.utils.compat
-- celery.utils.mail
-- celery.utils.functional
-- celery.utils.dispatch*
-- celery.utils.term
-- celery.messaging
-- celery.db.a805d4bd
-- celery.db.dfd042c7
-- celery.contrib*
-- celery.concurrency.threads
-- celery.concurrency.processes.pool
-- celery.concurrency.gevent
-- celery.backends.mongodb
-- celery.backends.tyrant
-- celery.backends.cassandra
-- celery.events.dumper
-- celery.events.cursesmon
+-cover3-exclude = celery.utils.debug,celery.tests.*
[build_sphinx]
source-dir = docs/
---- a/setup.py
-+++ b/setup.py
-@@ -134,7 +134,7 @@
-
- # -*- Tests Requires -*-
-
--tests_require = ["nose", "nose-cover3", "sqlalchemy", "mock", "cl"]
-+tests_require = ["nose", "sqlalchemy", "mock", "cl"]
- if sys.version_info < (2, 7):
- tests_require.append("unittest2")
- elif sys.version_info <= (2, 5):
+--- a/requirements/test.txt
++++ b/requirements/test.txt
+@@ -1,4 +1,3 @@
+ unittest2>=0.4.0
+ nose
+-nose-cover3
+ mock
Modified: packages/celery/tags/3.0.21-1/debian/patches/intersphinx.patch
===================================================================
--- packages/celery/branches/wheezy/debian/patches/intersphinx.patch 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/patches/intersphinx.patch 2013-07-15 11:59:36 UTC (rev 25194)
@@ -9,14 +9,16 @@
--- a/docs/conf.py
+++ b/docs/conf.py
-@@ -66,11 +66,20 @@
+@@ -74,13 +74,23 @@
# If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True
-intersphinx_mapping = {
-- "http://docs.python.org/dev": None,
-- "http://kombu.readthedocs.org/en/latest/": None,
-- "http://django-celery.readthedocs.org/en/latest": None,
+- 'python': ('http://docs.python.org/dev', None),
+- 'kombu': ('http://kombu.readthedocs.org/en/latest/', None),
+- 'djcelery': ('http://django-celery.readthedocs.org/en/latest', None),
+- 'cyme': ('http://cyme.readthedocs.org/en/latest', None),
+- 'amqp': ('http://amqp.readthedocs.org/en/latest', None),
-}
+def check_object_path(key, url, path):
+ if os.path.isfile(path):
@@ -32,6 +34,9 @@
+intersphinx_mapping.update(check_object_path('kombu',
+ 'http://kombu.readthedocs.org/en/latest/',
+ '/usr/share/doc/python-kombu-doc/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('amqp',
++ 'http://amqp.readthedocs.org/en/latest/',
++ '/usr/share/doc/python-amqp-doc/html/objects.inv'))
# The name of the Pygments (syntax highlighting) style to use.
- pygments_style = 'trac'
+ pygments_style = 'colorful'
Modified: packages/celery/tags/3.0.21-1/debian/patches/lsb-init.patch
===================================================================
--- packages/celery/branches/wheezy/debian/patches/lsb-init.patch 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/patches/lsb-init.patch 2013-07-15 11:59:36 UTC (rev 25194)
@@ -1,13 +1,13 @@
Description: LSB compliant headers, status actions and ENABLED variable
- Upstream ships it's own init scripts but they lack some LSB header and the
- (optional) "status" action. This patch fixes this and also adds a variable called ENABLED
- in /etc/default/celeryd.
+ Upstream ships it's own init scripts but they lack some LSB header and
+ the (optional) "status" action. This patch fixes this and also adds a
+ variable called ENABLED in /etc/default/celeryd.
Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2012-01-18
+Last-Update: 2013-07-01
Forwarded: no
---- a/contrib/generic-init.d/celeryd
-+++ b/contrib/generic-init.d/celeryd
+--- a/extra/generic-init.d/celeryd
++++ b/extra/generic-init.d/celeryd
@@ -16,6 +16,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
@@ -15,33 +15,27 @@
+# Description: Starts the Celery worker daemon for a single project.
### END INIT INFO
- #set -e
-@@ -25,16 +26,18 @@
+ # some commands work asyncronously, so we'll wait this many seconds
+@@ -26,10 +27,16 @@
DEFAULT_LOG_LEVEL="INFO"
DEFAULT_NODES="celery"
DEFAULT_CELERYD="-m celery.bin.celeryd_detach"
+ENABLED="false"
--# /etc/init.d/celeryd: start and stop the celery task worker daemon.
-+[ -r "$CELERY_DEFAULTS" ] && . "$CELERY_DEFAULTS"
+ CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/celeryd"}
--CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/celeryd"}
-+[ -r /etc/default/celeryd ] && . /etc/default/celeryd
-
-test -f "$CELERY_DEFAULTS" && . "$CELERY_DEFAULTS"
--if [ -f "/etc/default/celeryd" ]; then
-- . /etc/default/celeryd
++[ -r "$CELERY_DEFAULTS" ] && . "$CELERY_DEFAULTS"
++
+if [ "$ENABLED" != "true" ]; then
-+ echo "celery daemon disabled - see /etc/default/celeryd."
++ echo "celery daemon disabled - see $CELERY_DEFAULTS"
+ exit 0
- fi
++fi
-+
- CELERYD_PID_FILE=${CELERYD_PID_FILE:-${CELERYD_PIDFILE:-$DEFAULT_PID_FILE}}
- CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-${CELERYD_LOGFILE:-$DEFAULT_LOG_FILE}}
- CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-${CELERYD_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
---- a/contrib/generic-init.d/celeryevcam
-+++ b/contrib/generic-init.d/celeryevcam
+ # Set CELERY_CREATE_DIRS to always create log/pid dirs.
+ CELERY_CREATE_DIRS=${CELERY_CREATE_DIRS:-0}
+--- a/extra/generic-init.d/celeryevcam
++++ b/extra/generic-init.d/celeryevcam
@@ -1,6 +1,6 @@
#!/bin/bash
# ============================================
@@ -65,7 +59,7 @@
### END INIT INFO
# Cannot use set -e/bash -e since the kill -0 command will abort
-@@ -94,13 +95,15 @@
+@@ -94,13 +95,14 @@
DEFAULT_LOG_FILE="/var/log/celeryev.log"
DEFAULT_LOG_LEVEL="INFO"
DEFAULT_CELERYEV="/usr/bin/celeryev"
@@ -75,7 +69,6 @@
- . /etc/default/celeryd
-fi
+[ -r /etc/default/celeryd ] && . /etc/default/celeryd
-+
+[ -r /etc/default/celeryev ] && . /etc/default/celeryev
-if test -f /etc/default/celeryev; then
@@ -86,7 +79,7 @@
fi
CELERYEV=${CELERYEV:-$DEFAULT_CELERYEV}
-@@ -197,7 +200,16 @@
+@@ -197,7 +199,16 @@
--pidfile="$CELERYEV_PID_FILE"
}
@@ -104,7 +97,7 @@
case "$1" in
start)
-@@ -216,9 +228,12 @@
+@@ -216,9 +227,12 @@
check_dev_null
start_evcam
;;
@@ -118,8 +111,8 @@
exit 1
esac
---- a/contrib/generic-init.d/celerybeat
-+++ b/contrib/generic-init.d/celerybeat
+--- a/extra/generic-init.d/celerybeat
++++ b/extra/generic-init.d/celerybeat
@@ -15,6 +15,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
@@ -128,29 +121,29 @@
### END INIT INFO
# Cannot use set -e/bash -e since the kill -0 command will abort
-@@ -25,15 +26,15 @@
- DEFAULT_LOG_FILE="/var/log/celerybeat.log"
+@@ -25,15 +26,16 @@
+ DEFAULT_LOG_FILE="/var/log/celery/beat.log"
DEFAULT_LOG_LEVEL="INFO"
DEFAULT_CELERYBEAT="celerybeat"
+ENABLED="false"
--# /etc/init.d/ssh: start and stop the celery task worker daemon.
-+[ -r /etc/default/celeryd ] && . /etc/default/celeryd
+ # /etc/init.d/celerybeat: start and stop the celery periodic task scheduler daemon.
-if test -f /etc/default/celeryd; then
- . /etc/default/celeryd
-fi
++[ -r /etc/default/celeryd ] && . /etc/default/celeryd
+[ -r /etc/default/celerybeat ] && . /etc/default/celerybeat
-if test -f /etc/default/celerybeat; then
- . /etc/default/celerybeat
+if [ "$ENABLED" != "true" ]; then
-+ echo "celerybeat daemon disabled - read /etc/default/celeryd."
++ echo "celerybeat daemon disabled - see /etc/default/celeryd."
+ exit 0
fi
CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
-@@ -125,7 +126,16 @@
+@@ -172,7 +174,16 @@
--pidfile="$CELERYBEAT_PID_FILE"
}
@@ -167,18 +160,17 @@
+}
case "$1" in
- start)
-@@ -144,9 +154,12 @@
- check_dev_null
- start_beat
+ start)
+@@ -202,8 +213,11 @@
+ check_dev_null
+ check_paths
;;
-+ status)
-+ status
-+ ;;
-
- *)
-- echo "Usage: /etc/init.d/celerybeat {start|stop|restart}"
-+ echo "Usage: /etc/init.d/celerybeat {start|stop|restart|status}"
- exit 1
++ status)
++ status
++ ;;
+ *)
+- echo "Usage: /etc/init.d/celerybeat {start|stop|restart|create-paths}"
++ echo "Usage: /etc/init.d/celerybeat {start|stop|restart|create-paths|status}"
+ exit 64 # EX_USAGE
+ ;;
esac
-
Modified: packages/celery/tags/3.0.21-1/debian/patches/series
===================================================================
--- packages/celery/branches/wheezy/debian/patches/series 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/patches/series 2013-07-15 11:59:36 UTC (rev 25194)
@@ -1,3 +1,4 @@
lsb-init.patch
fix_dependencies.patch
intersphinx.patch
+drop_downgrade.patch
Modified: packages/celery/tags/3.0.21-1/debian/python-celery-doc.doc-base
===================================================================
--- packages/celery/branches/wheezy/debian/python-celery-doc.doc-base 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/python-celery-doc.doc-base 2013-07-15 11:59:36 UTC (rev 25194)
@@ -6,9 +6,24 @@
Format: HTML
Index: /usr/share/doc/python-celery-doc/html/index.html
Files: /usr/share/doc/python-celery-doc/html/*.html
- /usr/share/doc/python-celery-doc/html/cookbook/*.html
+ /usr/share/doc/python-celery-doc/html/django/*.html
/usr/share/doc/python-celery-doc/html/getting-started/*.html
+ /usr/share/doc/python-celery-doc/html/history/*.html
/usr/share/doc/python-celery-doc/html/internals/*.html
+ /usr/share/doc/python-celery-doc/html/internals/reference/*.html
/usr/share/doc/python-celery-doc/html/reference/*.html
/usr/share/doc/python-celery-doc/html/tutorials/*.html
/usr/share/doc/python-celery-doc/html/userguide/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/utils/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/bin/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/backends/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/task/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/worker/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/concurrency/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/loaders/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/security/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/app/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/contrib/*.html
+ /usr/share/doc/python-celery-doc/html/_modules/celery/events/*.html
Deleted: packages/celery/tags/3.0.21-1/debian/python-celery.celeryd.default
===================================================================
--- packages/celery/branches/wheezy/debian/python-celery.celeryd.default 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/python-celery.celeryd.default 2013-07-15 11:59:36 UTC (rev 25194)
@@ -1,35 +0,0 @@
-# Edit the options in this file to match your projects environment.
-# See http://ask.github.com/celery/cookbook/daemonizing.html for the complete
-# documentation on the options.
-
-# WARNING: This script is only designed to run the worker(s) for a single
-# project. If you need to start workers for multiple projects you should
-# consider using supervisor.
-# Examples can be found in /usr/share/doc/python-celery/supervisord/
-
-# Change this to true when done to enable the init.d script.
-# Default: false
-ENABLED="false"
-
-# Name of nodes to start
-# here we have a single node
-CELERYD_NODES="w1"
-# or we could have three nodes:
-#CELERYD_NODES="w1 w2 w3"
-
-# Where to chdir at start.
-CELERYD_CHDIR="/opt/Myproject/"
-
-# Extra arguments to celeryd
-CELERYD_OPTS="--time-limit=300 --concurrency=8"
-
-# Name of the celery config module.
-CELERY_CONFIG_MODULE="celeryconfig"
-
-# %n will be replaced with the nodename.
-CELERYD_LOG_FILE="/var/log/celery/%n.log"
-CELERYD_PID_FILE="/var/run/celery/%n.pid"
-
-# Workers should run as an unprivileged user.
-CELERYD_USER="celery"
-CELERYD_GROUP="celery"
Modified: packages/celery/tags/3.0.21-1/debian/python-celery.docs
===================================================================
--- packages/celery/branches/wheezy/debian/python-celery.docs 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/python-celery.docs 2013-07-15 11:59:36 UTC (rev 25194)
@@ -1,3 +1,2 @@
-README
-FAQ
-contrib/supervisord
+README.rst
+extra/supervisord
Modified: packages/celery/tags/3.0.21-1/debian/python-celery.manpages
===================================================================
--- packages/celery/branches/wheezy/debian/python-celery.manpages 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/python-celery.manpages 2013-07-15 11:59:36 UTC (rev 25194)
@@ -4,3 +4,4 @@
celeryd-multi.1
celeryev.1
camqadm.1
+celery.1
Modified: packages/celery/tags/3.0.21-1/debian/rules
===================================================================
--- packages/celery/branches/wheezy/debian/rules 2013-07-01 20:47:22 UTC (rev 25065)
+++ packages/celery/tags/3.0.21-1/debian/rules 2013-07-15 11:59:36 UTC (rev 25194)
@@ -6,7 +6,7 @@
.PHONY: override_dh_installman
override_dh_installman:
set -e ; \
- for doc in camqadm celerybeat celeryd-multi celeryd celeryev celeryctl; do \
+ for doc in celery camqadm celerybeat celeryd-multi celeryd celeryev celeryctl; do \
docbook-to-man debian/manpage.$$doc.sgml > $$doc.1; \
done
dh_installman
@@ -37,10 +37,14 @@
.PHONY: override_dh_installinit
override_dh_installinit:
- ln contrib/generic-init.d/celerybeat debian/python-celery.celerybeat.init
- ln contrib/generic-init.d/celeryd debian/python-celery.celeryd.init
- ln contrib/generic-init.d/celeryevcam debian/python-celery.celeryevcam.init
+ ln extra/generic-init.d/celerybeat debian/celeryd.celerybeat.init
+ ln extra/generic-init.d/celeryd debian/celeryd.celeryd.init
+ ln extra/generic-init.d/celeryevcam debian/celeryd.celeryevcam.init
dh_installinit --name celerybeat
dh_installinit --name celeryd
dh_installinit --name celeryevcam
dh_installinit --name celery
+
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
+ dh_installchangelogs Changelog
More information about the Python-modules-commits
mailing list