Distribution cleanup and prepare for release

celery · Nov 9, 2013 · f8dace1 · f8dace1
1 parent 828216b
commit f8dace1
Show file tree

Hide file tree

Showing 33 changed files with 32 additions and 513 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -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

diff --git a/TODO b/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).
diff --git a/celery/__init__.py b/celery/__init__.py
@@ -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())
diff --git a/celery/datastructures.py b/celery/datastructures.py
@@ -52,7 +52,7 @@ class GraphFormatter(object):
         'shape': 'box',
         'arrowhead': 'vee',
         'style': 'filled',
-        'fontname': 'Helvetica Neue',
+        'fontname': 'HelveticaNeue',
     }
     edge_scheme = {
         'color': 'darkseagreen4',

diff --git a/celery/tests/case.py b/celery/tests/case.py
@@ -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):

diff --git a/celery/tests/tasks/test_result.py b/celery/tests/tasks/test_result.py
@@ -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)

diff --git a/celery/tests/utils/test_timer2.py b/celery/tests/utils/test_timer2.py
@@ -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:

diff --git a/docs/.templates/page.html b/docs/.templates/page.html
@@ -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:

diff --git a/docs/images/Celery-Overview-v4.jpg b/docs/images/Celery-Overview-v4.jpg
diff --git a/docs/images/icon-paypal.png b/docs/images/icon-paypal.png
diff --git a/docs/images/worker_graph_full.png b/docs/images/worker_graph_full.png
diff --git a/docs/internals/reference/index.rst b/docs/internals/reference/index.rst
@@ -22,7 +22,6 @@
     celery.concurrency.gevent
     celery.concurrency.base
     celery.concurrency.threads
-    celery.beat
     celery.backends
     celery.backends.base
     celery.backends.rpc

diff --git a/docs/internals/reference/celery.beat.rst → docs/reference/celery.beat.rst b/docs/internals/reference/celery.beat.rst → docs/reference/celery.beat.rst
diff --git a/docs/reference/celery.task.base.rst b/docs/reference/celery.task.base.rst
diff --git a/docs/reference/celery.task.rst b/docs/reference/celery.task.rst
diff --git a/docs/reference/index.rst b/docs/reference/index.rst
@@ -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

diff --git a/docs/tutorials/daemonizing.rst b/docs/tutorials/daemonizing.rst
@@ -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:

diff --git a/docs/whatsnew-3.1.rst b/docs/whatsnew-3.1.rst
@@ -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                      |
 +=============+=========================+===========================+

diff --git a/docs/xreftest.rst b/docs/xreftest.rst
diff --git a/extra/debian/README.rst b/extra/debian/README.rst
diff --git a/extra/logtools/find-unprocessed-tasks-debug.sh b/extra/logtools/find-unprocessed-tasks-debug.sh