Permalink
Browse files

Distribution cleanup and prepare for release

  • Loading branch information...
1 parent 828216b commit f8dace1ba9aeb4749aae3ca03890e062105a8422 @ask ask committed Nov 9, 2013
View
@@ -8,7 +8,13 @@ include setup.cfg
include setup.py
recursive-include celery *.py
recursive-include docs *
-recursive-include extra *
+recursive-include extra/bash-completion *
+recursive-include extra/centos *
+recursive-include extra/generic-init.d *
+recursive-include extra/osx *
+recursive-include extra/supervisord *
+recursive-include extra/systemd *
+recursive-include extra/zsh-completion *
recursive-include examples *
recursive-include requirements *.txt
prune *.pyc
View
8 TODO
@@ -1,10 +1,2 @@
Please see our Issue Tracker at GitHub:
http://github.com/celery/celery/issues
-
-Celerymon
-=========
-
-Create a UI for celerymon using js, with statistics and so on.
-Needs a graphing library, maybe highcharts
-(http://www.highcharts.com/: awesome but weird license) or InfoVis
-(http://thejit.org/; BSD licensed).
View
@@ -143,61 +143,3 @@ def maybe_patch_concurrency(argv=sys.argv,
maybe_patch_concurrency=maybe_patch_concurrency,
_find_option_with_arg=_find_option_with_arg,
)
-
-
-if sys.version_info[0:2] == (3, 2):
- # There is a problem in Python3's import system where it
- # returns the raw module object instead of the one
- # kept in ``sys.modules``.
-
- # This breaks our dynamically generated modules because we insert
- # them into sys.modules, and expect the import statement to return
- # that.
-
- # I'm not entirely sure of why, or when it happens, but this import hook
- # fixes the problem. The bug can be reproduced by disabling the hook
- # and doing the following:
- #
- # >>> import celery
- # >>> from celery.task import sets
- # >>> from celery import task
- # >>> type(celery.task)
- # <class 'celery.task'>
- # >>> import sys
- # >>> import celery
- # >>> sys.modules.pop('celery.task')
- # <module 'celery.task' from 'celery/task/__init__.py'>
- # >>> from celery.task import sets
- # Traceback (most recent call last):
- # File "<stdin>", line 1, in <module>
- # ImportError: cannot import name sets
- # >>> type(celery.task)
- # <class 'module'> # <-- where did this come from?!?
-
- # Note that popping the module from sys.modules is just a way to force
- # this to happen and I'm sure it happens in other cases too.
-
- # [ask]
-
- import imp
-
- class FixBrokenImportHook(object):
- generated_modules = ('celery', 'celery.task')
-
- def load_module(self, name, *args):
- try:
- return sys.modules[name]
- except KeyError:
- modname, path = name, None
- if '.' in name:
- modname, path = name.split('.')[-1], __path__
- module_info = imp.find_module(modname, path)
- imp.load_module(name, *module_info)
- return sys.modules[name]
-
- def find_module(self, name, path):
- if name in self.generated_modules:
- return self
- return None
-
- sys.meta_path.insert(0, FixBrokenImportHook())
View
@@ -52,7 +52,7 @@ class GraphFormatter(object):
'shape': 'box',
'arrowhead': 'vee',
'style': 'filled',
- 'fontname': 'Helvetica Neue',
+ 'fontname': 'HelveticaNeue',
}
edge_scheme = {
'color': 'darkseagreen4',
View
@@ -47,7 +47,7 @@
__all__ = [
'Case', 'AppCase', 'Mock', 'patch', 'call', 'skip_unless_module',
'wrap_logger', 'with_environ', 'sleepdeprived',
- 'skip_if_environ', 'skip_if_quick', 'todo', 'skip', 'skip_if',
+ 'skip_if_environ', 'todo', 'skip', 'skip_if',
'skip_unless', 'mask_modules', 'override_stdouts', 'mock_module',
'replace_module_value', 'sys_platform', 'reset_modules',
'patch_modules', 'mock_context', 'mock_open', 'patch_many',
@@ -452,10 +452,6 @@ def _skips_if_environ(*args, **kwargs):
return _wrap_test
-def skip_if_quick(fun):
- return skip_if_environ('QUICKTEST')(fun)
-
-
def _skip_test(reason, sign):
def _wrap_test(fun):
@@ -15,7 +15,7 @@
from celery.utils import uuid
from celery.utils.serialization import pickle
-from celery.tests.case import AppCase, depends_on_current_app, skip_if_quick
+from celery.tests.case import AppCase, depends_on_current_app
def mock_task(name, state, result):
@@ -650,7 +650,6 @@ def x_join(self):
with self.assertRaises(TimeoutError):
self.ts.join(timeout=0.001)
- @skip_if_quick
def x_join_longer(self):
with self.assertRaises(TimeoutError):
self.ts.join(timeout=1)
@@ -5,7 +5,7 @@
import celery.utils.timer2 as timer2
-from celery.tests.case import Case, Mock, patch, skip_if_quick
+from celery.tests.case import Case, Mock, patch
from kombu.tests.case import redirect_stdouts
@@ -68,7 +68,6 @@ def on_error(exc_info):
class test_Timer(Case):
- @skip_if_quick
def test_enter_after(self):
t = timer2.Timer()
try:
@@ -2,7 +2,7 @@
{% block body %}
<div class="deck">
- {% if version == "3.1" or version == "4.0" %}
+ {% if version == "3.2" or version == "4.0" %}
<p class="developmentversion">
This document is for Celery's development version, which can be
significantly different from previous releases. Get old docs here:
Deleted file not rendered
View
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -22,7 +22,6 @@
celery.concurrency.gevent
celery.concurrency.base
celery.concurrency.threads
- celery.beat
celery.backends
celery.backends.base
celery.backends.rpc
@@ -1,10 +0,0 @@
-===================================
- celery.task.base (Deprecated)
-===================================
-
-.. contents::
- :local:
-.. currentmodule:: celery.task.base
-
-.. automodule:: celery.task.base
- :members: BaseTask, PeriodicTask, TaskType
@@ -1,18 +0,0 @@
-=====================================================
- celery.task
-=====================================================
-
-.. contents::
- :local:
-.. currentmodule:: celery.task
-
-.. automodule:: celery.task
-
- .. autofunction:: task
-
- .. autofunction:: periodic_task
-
- .. autoclass:: Task
-
- .. seealso::
- :class:`celery.task.base.BaseTask`.
View
@@ -21,8 +21,6 @@
celery.app.log
celery.app.utils
celery.bootsteps
- celery.task
- celery.task.base
celery.result
celery.task.http
celery.schedules
@@ -43,6 +41,7 @@
celery.contrib.methods
celery.events
celery.events.state
+ celery.beat
celery.apps.worker
celery.apps.beat
celery.worker
@@ -382,10 +382,10 @@ you should :ref:`report it <reporting-bugs>`).
launchd (OS X)
==============
-* `extra/mac/`_
+* `extra/osx`_
-.. _`extra/mac/`:
- http://github.com/celery/celery/tree/3.1/extra/mac/
+.. _`extra/osx`:
+ http://github.com/celery/celery/tree/3.1/extra/osx/
.. _daemon-windows:
View
@@ -578,6 +578,12 @@ You install extras by specifying them inside brackets:
The above will install the dependencies for Redis and MongoDB. You can list
as many extras as you want.
+
+.. warning::
+
+ You can't use the ``celery-with-*`` packages anymore, as these will not be
+ updated to use Celery 3.1.
+
+-------------+-------------------------+---------------------------+
| Extension | Requirement entry | Type |
+=============+=========================+===========================+
View
@@ -1,53 +0,0 @@
-xreftest
-========
-
-Must not be in public docs
---------------------------
-
-hello, how do you do3
-
-
-``meth @Task.retry``: :meth:`@Task.retry`
-
-``meth @-Task.retry``: :meth:`@-Task.retry`
-
-``meth ~@Task.retry``: :meth:`~@Task.retry`
-
-
-``class @Celery``: :class:`@Celery`
-
-``class @-Celery``: :class:`@-Celery`
-
-``class ~@Celery``: :class:`~@Celery`
-
-
-``meth @Celery.config_from_object``: :meth:`@Celery.config_from_object`
-
-``meth @-Celery.config_from_object``: :meth:`@-Celery.config_from_object`
-
-``meth ~@Celery.config_from_object``: :meth:`~@Celery.config_from_object`
-
-``meth celery.Celery.config_from_object``: :meth:`@Celery.send_task`
-
-:class:`celery.Celery`
-
-:class:`celery.subtask.link`
-
-
-``attr @amqp``: :attr:`@amqp`
-
-``attr @-amqp``: :attr:`@-amqp`
-
-``attr ~@amqp``: :attr:`~@amqp`
-
-
-``meth @amqp.TaskConsumer``: :meth:`@amqp.TaskConsumer`
-
-``meth @-amqp.TaskConsumer``: :meth:`@-amqp.TaskConsumer`
-
-``meth ~@amqp.TaskConsumer``: :meth:`~@amqp.TaskConsumer`
-
-
-``exc @NotRegistered``: :exc:`@NotRegistered`
-
-``exc @-NotRegistered``: :exc:`@-NotRegistered`
View
@@ -1,2 +0,0 @@
-These init scripts have been deprecated,
-please use ../generic-init.d instead.
@@ -1,72 +0,0 @@
-#!/bin/bash
-#--------------------------------------------------------------------#
-# Find all currently unprocessed tasks by searching the celeryd
-# log file.
-#
-# Please note that this will also include tasks that raised an exception,
-# or is just under active processing (will finish soon).
-#
-# Usage:
-#
-# # Using default log file /var/log/celeryd.log
-# $ bash find-unprocessed-tasks.sh
-#
-# # Using a custom logfile
-# # bash find-unprocessed-tasks.sh ./celeryd.log
-#
-#--------------------------------------------------------------------#
-
-DEFAULT_LOGFILE=/var/log/celeryd.log
-export CELERYD_LOGFILE=${1:-$DEFAULT_LOGFILE}
-
-
-get_start_date_by_task_id() {
- task_id="$1"
- grep Apply $CELERYD_LOGFILE | \
- grep "$task_id" | \
- perl -nle'
- /^\[(.+?): DEBUG/; print $1' | \
- sed 's/\s*$//'
-}
-
-
-get_end_date_by_task_id() {
- task_id="$1"
- grep processed $CELERYD_LOGFILE | \
- grep "$task_id" | \
- perl -nle'
- /^\[(.+?): INFO/; print $1 ' | \
- sed 's/\s*$//'
-}
-
-
-get_all_task_ids() {
- grep Apply $CELERYD_LOGFILE | perl -nle"/'task_id': '(.+?)'/; print \$1"
-}
-
-
-search_logs_for_task_id() {
- grep "$task_id" $CELERYD_LOGFILE
-}
-
-
-report_unprocessed_task() {
- task_id="$1"
- date_start="$2"
-
- cat <<EOFTEXT
-"---------------------------------------------------------------------------------"
-| UNFINISHED TASK: $task_id [$date_start]
-"---------------------------------------------------------------------------------"
-Related logs:
-EOFTEXT
- search_logs_for_task_id "$task_id"
-}
-
-for task_id in $(get_all_task_ids); do
- date_start=$(get_start_date_by_task_id "$task_id")
- date_end=$(get_end_date_by_task_id "$task_id")
- if [ -z "$date_end" ]; then
- report_unprocessed_task "$task_id" "$date_start"
- fi
-done
Oops, something went wrong.

0 comments on commit f8dace1

Please sign in to comment.