renames worker.abstract -> worker.bootsteps

celery/tests/worker/test_bootsteps.py

@@ -3,34 +3,34 @@ from __future__ import with_statement
 
 from mock import Mock
 
-from celery.worker import abstract
+from celery.worker import bootsteps
 
 from celery.tests.utils import AppCase, Case
 
 
 class test_Component(Case):
 
-    class Def(abstract.Component):
+    class Def(bootsteps.Component):
         name = "test_Component.Def"
 
     def test_components_must_be_named(self):
         with self.assertRaises(NotImplementedError):
 
-            class X(abstract.Component):
+            class X(bootsteps.Component):
                 pass
 
-        class Y(abstract.Component):
-            abstract = True
+        class Y(bootsteps.Component):
+            bootsteps = True
 
     def test_namespace_name(self, ns="test_namespace_name"):
 
-        class X(abstract.Component):
+        class X(bootsteps.Component):
             namespace = ns
             name = "X"
         self.assertEqual(X.namespace, ns)
         self.assertEqual(X.name, "X")
 
-        class Y(abstract.Component):
+        class Y(bootsteps.Component):
             name = "%s.Y" % (ns, )
         self.assertEqual(Y.namespace, ns)
         self.assertEqual(Y.name, "Y")
@@ -73,7 +73,7 @@ class test_Component(Case):
 
 class test_StartStopComponent(Case):
 
-    class Def(abstract.StartStopComponent):
+    class Def(bootsteps.StartStopComponent):
         name = "test_StartStopComponent.Def"
 
     def setUp(self):
@@ -125,13 +125,13 @@ class test_StartStopComponent(Case):
 
 class test_Namespace(AppCase):
 
-    class NS(abstract.Namespace):
+    class NS(bootsteps.Namespace):
         name = "test_Namespace"
 
-    class ImportingNS(abstract.Namespace):
+    class ImportingNS(bootsteps.Namespace):
 
         def __init__(self, *args, **kwargs):
-            abstract.Namespace.__init__(self, *args, **kwargs)
+            bootsteps.Namespace.__init__(self, *args, **kwargs)
             self.imported = []
 
         def modules(self):
@@ -142,13 +142,13 @@ class test_Namespace(AppCase):
 
     def test_components_added_to_unclaimed(self):
 
-        class tnA(abstract.Component):
+        class tnA(bootsteps.Component):
             name = "test_Namespace.A"
 
-        class tnB(abstract.Component):
+        class tnB(bootsteps.Component):
             name = "test_Namespace.B"
 
-        class xxA(abstract.Component):
+        class xxA(bootsteps.Component):
             name = "xx.A"
 
         self.assertIn("A", self.NS._unclaimed["test_Namespace"])
@@ -172,24 +172,24 @@ class test_Namespace(AppCase):
 
     def test_apply(self):
 
-        class MyNS(abstract.Namespace):
+        class MyNS(bootsteps.Namespace):
             name = "test_apply"
 
             def modules(self):
                 return ["A", "B"]
 
-        class A(abstract.Component):
+        class A(bootsteps.Component):
             name = "test_apply.A"
             requires = ["C"]
 
-        class B(abstract.Component):
+        class B(bootsteps.Component):
             name = "test_apply.B"
 
-        class C(abstract.Component):
+        class C(bootsteps.Component):
             name = "test_apply.C"
             requires = ["B"]
 
-        class D(abstract.Component):
+        class D(bootsteps.Component):
             name = "test_apply.D"
             last = True
 
@@ -217,7 +217,7 @@ class test_Namespace(AppCase):
 
     def test_find_last_but_no_components(self):
 
-        class MyNS(abstract.Namespace):
+        class MyNS(bootsteps.Namespace):
             name = "qwejwioqjewoqiej"
 
         x = MyNS(app=self.app)

celery/worker/__init__.py

@@ -6,7 +6,7 @@
     :class:`WorkController` can be used to instantiate in-process workers.
 
     The worker consists of several components, all managed by boot-steps
-    (mod:`celery.abstract`).
+    (mod:`celery.worker.bootsteps`).
 
 """
 from __future__ import absolute_import
@@ -37,7 +37,7 @@ from celery.utils.log import get_logger
 from celery.utils.threads import Event
 from celery.utils.timer2 import Schedule
 
-from . import abstract
+from . import bootsteps
 from . import state
 from .buckets import TaskBucket, FastQueue
 from .hub import Hub, BoundedSemaphore
@@ -49,7 +49,7 @@ TERMINATE = 0x3
 logger = get_logger(__name__)
 
 
-class Namespace(abstract.Namespace):
+class Namespace(bootsteps.Namespace):
     """This is the boot-step namespace of the :class:`WorkController`.
 
     It loads modules from :setting:`CELERYD_BOOT_STEPS`, and its
@@ -67,7 +67,7 @@ class Namespace(abstract.Namespace):
               + self.app.conf.CELERYD_BOOT_STEPS)
 
 
-class Pool(abstract.StartStopComponent):
+class Pool(bootsteps.StartStopComponent):
     """The pool component.
 
     Describes how to initialize the worker pool, and starts and stops
@@ -159,7 +159,7 @@ class Pool(abstract.StartStopComponent):
         return pool
 
 
-class Beat(abstract.StartStopComponent):
+class Beat(bootsteps.StartStopComponent):
     """Component used to embed a celerybeat process.
 
     This will only be enabled if the ``beat``
@@ -180,7 +180,7 @@ class Beat(abstract.StartStopComponent):
         return b
 
 
-class Queues(abstract.Component):
+class Queues(bootsteps.Component):
     """This component initializes the internal queues
     used by the worker."""
     name = 'worker.queues'
@@ -206,7 +206,7 @@ class Queues(abstract.Component):
             w.ready_queue = TaskBucket(task_registry=w.app.tasks)
 
 
-class EvLoop(abstract.StartStopComponent):
+class EvLoop(bootsteps.StartStopComponent):
     name = 'worker.ev'
 
     def __init__(self, w, **kwargs):
@@ -221,7 +221,7 @@ class EvLoop(abstract.StartStopComponent):
         return hub
 
 
-class Timers(abstract.Component):
+class Timers(bootsteps.Component):
     """This component initializes the internal timers used by the worker."""
     name = 'worker.timers'
     requires = ('pool', )
@@ -246,7 +246,7 @@ class Timers(abstract.Component):
         logger.debug('Timer wake-up! Next eta %s secs.', delay)
 
 
-class StateDB(abstract.Component):
+class StateDB(bootsteps.Component):
     """This component sets up the workers state db if enabled."""
     name = 'worker.state-db'
 

celery/worker/autoreload.py

@@ -24,7 +24,7 @@ from celery.utils.imports import module_file
 from celery.utils.log import get_logger
 from celery.utils.threads import bgThread, Event
 
-from .abstract import StartStopComponent
+from .bootsteps import StartStopComponent
 
 try:                        # pragma: no cover
     import pyinotify

celery/worker/autoscale.py

@@ -23,7 +23,7 @@ from celery.utils.log import get_logger
 from celery.utils.threads import bgThread
 
 from . import state
-from .abstract import StartStopComponent
+from .bootsteps import StartStopComponent
 from .hub import DummyLock
 
 logger = get_logger(__name__)

celery/worker/abstract.py → celery/worker/bootsteps.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    celery.worker.abstract
-    ~~~~~~~~~~~~~~~~~~~~~~
+    celery.worker.bootsteps
+    ~~~~~~~~~~~~~~~~~~~~~~~
 
     The boot-step components.
 

celery/worker/consumer.py

@@ -93,7 +93,7 @@ from celery.utils.log import get_logger
 from celery.utils import text
 
 from . import state
-from .abstract import StartStopComponent
+from .bootsteps import StartStopComponent
 from .control import Panel
 from .heartbeat import Heart
 

celery/worker/mediator.py

@@ -23,7 +23,7 @@ from celery.app import app_or_default
 from celery.utils.threads import bgThread
 from celery.utils.log import get_logger
 
-from .abstract import StartStopComponent
+from .bootsteps import StartStopComponent
 
 logger = get_logger(__name__)
 

docs/internals/reference/celery.worker.abstract.rst → docs/internals/reference/celery.worker.bootsteps.rst

@@ -1,11 +1,11 @@
 ==========================================
- celery.worker.abstract
+ celery.worker.bootsteps
 ==========================================
 
 .. contents::
     :local:
-.. currentmodule:: celery.worker.abstract
+.. currentmodule:: celery.worker.bootsteps
 
-.. automodule:: celery.worker.abstract
+.. automodule:: celery.worker.bootsteps
     :members:
     :undoc-members:

docs/internals/reference/index.rst

@@ -20,7 +20,7 @@
     celery.worker.strategy
     celery.worker.autoreload
     celery.worker.autoscale
-    celery.worker.abstract
+    celery.worker.bootsteps
     celery.concurrency
     celery.concurrency.solo
     celery.concurrency.processes