Renames .worker.bootsteps to .bootsteps and to Public API

celery/bin/__init__.py

@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from .base import Option  # noqa

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

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

celery/tests/worker/test_bootsteps.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from mock import Mock
 
-from celery.worker import bootsteps
+from celery import bootsteps
 
 from celery.tests.utils import AppCase, Case
 

celery/tests/worker/test_worker.py

@@ -17,6 +17,7 @@ from nose import SkipTest
 
 from celery import current_app
 from celery.app.defaults import DEFAULTS
+from celery.bootsteps import RUN, CLOSE, TERMINATE, StartStopStep
 from celery.concurrency.base import BasePool
 from celery.datastructures import AttributeDict
 from celery.exceptions import SystemTerminate
@@ -25,7 +26,6 @@ from celery.task import periodic_task as periodic_task_dec
 from celery.utils import uuid
 from celery.worker import WorkController
 from celery.worker.components import Queues, Timers, Hub, Pool
-from celery.worker.bootsteps import RUN, CLOSE, TERMINATE, StartStopStep
 from celery.worker.buckets import FastQueue
 from celery.worker.job import Request
 from celery.worker import consumer

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.worker.bootsteps`).
+    (mod:`celery.bootsteps`).
 
 """
 from __future__ import absolute_import
@@ -19,6 +19,7 @@ from billiard import cpu_count
 from kombu.syn import detect_environment
 from kombu.utils.finalize import Finalize
 
+from celery import bootsteps
 from celery import concurrency as _concurrency
 from celery import platforms
 from celery import signals
@@ -31,7 +32,6 @@ from celery.utils import worker_direct
 from celery.utils.imports import reload_from_cwd
 from celery.utils.log import mlevel, worker_logger as logger
 
-from . import bootsteps
 from . import state
 
 UNKNOWN_QUEUE = """\

celery/worker/autoreload.py

@@ -18,13 +18,12 @@ from threading import Event
 
 from kombu.utils import eventio
 
+from celery import bootsteps
 from celery.platforms import ignore_errno
 from celery.utils.imports import module_file
 from celery.utils.log import get_logger
 from celery.utils.threads import bgThread
 
-from . import bootsteps
-
 try:                        # pragma: no cover
     import pyinotify
     _ProcessEvent = pyinotify.ProcessEvent

celery/worker/autoscale.py

@@ -18,10 +18,10 @@ import threading
 from functools import partial
 from time import sleep, time
 
+from celery import bootsteps
 from celery.utils.log import get_logger
 from celery.utils.threads import bgThread
 
-from . import bootsteps
 from . import state
 from .hub import DummyLock
 

celery/worker/components.py

@@ -15,10 +15,11 @@ from functools import partial
 
 from billiard.exceptions import WorkerLostError
 
+from celery import bootsteps
 from celery.utils.log import worker_logger as logger
 from celery.utils.timer2 import Schedule
 
-from . import bootsteps, hub
+from . import hub
 from .buckets import TaskBucket, FastQueue
 
 

celery/worker/consumer.py

@@ -17,6 +17,7 @@ from kombu.common import QoS, ignore_errors
 from kombu.syn import _detect_environment
 from kombu.utils.encoding import safe_repr
 
+from celery import bootsteps
 from celery.app import app_or_default
 from celery.task.trace import build_tracer
 from celery.utils.timer2 import default_timer, to_timestamp
@@ -25,7 +26,7 @@ from celery.utils.log import get_logger
 from celery.utils.text import truncate
 from celery.utils.timeutils import humanize_seconds, timezone
 
-from . import bootsteps, heartbeat, loops, pidbox
+from . import heartbeat, loops, pidbox
 from .state import task_reserved, maybe_shutdown
 
 CLOSE = bootsteps.CLOSE

celery/worker/loops.py

@@ -14,9 +14,10 @@ from Queue import Empty
 
 from kombu.utils.eventio import READ, WRITE, ERR
 
+from celery.bootsteps import CLOSE
 from celery.exceptions import InvalidTaskError, SystemTerminate
-from celery.worker import state
-from celery.worker.bootsteps import CLOSE
+
+from . import state
 
 #: Heartbeat check is called every heartbeat_seconds' / rate'.
 AMQHEARTBEAT_RATE = 2.0

celery/worker/mediator.py

@@ -20,10 +20,10 @@ import logging
 from Queue import Empty
 
 from celery.app import app_or_default
+from celery.bootsteps import StartStopStep
 from celery.utils.threads import bgThread
 from celery.utils.log import get_logger
 
-from .bootsteps import StartStopStep
 
 logger = get_logger(__name__)
 

docs/configuration.rst

@@ -1409,7 +1409,7 @@ CELERYD_BOOT_STEPS
 
 This setting enables you to add additional components to the worker process.
 It should be a list of module names with
-:class:`celery.worker.bootsteps.Component`
+:class:`celery.bootsteps.Step`
 classes, that augments functionality in the worker.
 
 .. setting:: CELERYD_CONSUMER_BOOT_STEPS
@@ -1419,7 +1419,7 @@ CELERYD_CONSUMER_BOOT_STEPS
 
 This setting enables you to add additional components to the workers consumer.
 It should be a list of module names with
-:class:`celery.worker.bootsteps.Component`` classes, that augments
+:class:`celery.bootsteps.Step`` classes, that augments
 functionality in the consumer.
 
 .. setting:: CELERYD_POOL

docs/internals/reference/index.rst

@@ -21,7 +21,6 @@
     celery.worker.strategy
     celery.worker.autoreload
     celery.worker.autoscale
-    celery.worker.bootsteps
     celery.concurrency
     celery.concurrency.solo
     celery.concurrency.processes

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

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