Moves celery.db* -> celery.backends.database.*

celery/backends/database.py → celery/backends/database/__init__.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-from .. import states
-from ..db.models import Task, TaskSet
-from ..db.session import ResultSession
-from ..exceptions import ImproperlyConfigured
-from ..utils.timeutils import maybe_timedelta
+from celery import states
+from celery.exceptions import ImproperlyConfigured
+from celery.utils.timeutils import maybe_timedelta
 
-from .base import BaseDictBackend
+from celery.backends.base import BaseDictBackend
+
+from .models import Task, TaskSet
+from .session import ResultSession
 
 
 def _sqlalchemy_installed():

celery/db/models.py → celery/backends/database/models.py

@@ -5,7 +5,7 @@ from datetime import datetime
 
 import sqlalchemy as sa
 
-from .. import states
+from celery import states
 
 from .session import ResultModelBase
 

celery/tests/test_backends/test_database.py

@@ -21,7 +21,7 @@ except ImportError:
     DatabaseBackend = Task = TaskSet = None
 else:
     from celery.backends.database import DatabaseBackend
-    from celery.db.models import Task, TaskSet
+    from celery.backends.database.models import Task, TaskSet
 
 
 class SomeClass(object):
@@ -48,18 +48,18 @@ class test_DatabaseBackend(Case):
 
     def test_pickle_hack_for_sqla_05(self):
         import sqlalchemy as sa
-        from celery.db import session
+        from celery.backends.database import session
         prev_base = session.ResultModelBase
         prev_ver, sa.__version__ = sa.__version__, "0.5.0"
-        prev_models = sys.modules.pop("celery.db.models", None)
+        prev_models = sys.modules.pop("celery.backends.database.models", None)
         try:
             from sqlalchemy.ext.declarative import declarative_base
             session.ResultModelBase = declarative_base()
-            from celery.db.dfd042c7 import PickleType as Type1
-            from celery.db.models import PickleType as Type2
+            from celery.backends.database.dfd042c7 import PickleType as Type1
+            from celery.backends.database.models import PickleType as Type2
             self.assertIs(Type1, Type2)
         finally:
-            sys.modules["celery.db.models"] = prev_models
+            sys.modules["celery.backends.database.models"] = prev_models
             sa.__version__ = prev_ver
             session.ResultModelBase = prev_base
 

celery/tests/test_worker/test_bootsteps.py

@@ -3,7 +3,7 @@ from __future__ import with_statement
 
 from mock import Mock
 
-from celery import abstract
+from celery.worker import abstract
 
 from celery.tests.utils import AppCase, Case
 

celery/worker/__init__.py

@@ -23,7 +23,6 @@ import traceback
 
 from kombu.utils.finalize import Finalize
 
-from .. import abstract
 from .. import concurrency as _concurrency
 from ..app import app_or_default
 from ..app.abstract import configurated, from_config
@@ -31,6 +30,7 @@ from ..exceptions import SystemTerminate
 from ..utils.functional import noop
 from ..utils.imports import qualname, reload_from_cwd
 
+from . import abstract
 from . import state
 from .buckets import TaskBucket, FastQueue
 

contrib/release/doc4allmods

@@ -11,20 +11,13 @@ SKIP_FILES="celery.backends.pyredis.rst
             celery.contrib.rst
             celery.contrib.bundles.rst
             celery.worker.control.rst
-            celery.worker.control.builtins.rst
-            celery.worker.control.registry.rst
             celery.task.schedules.rst
             celery.local.rst
-            celery.models.rst
             celery.app.base.rst
             celery.apps.rst
-            celery.db.rst
-            celery.messaging.rst
             celery.execute.rst
-            celery.conf.rst
-            celery.decorators.rst
-            celery.db.a805d4bd.rst
-            celery.db.dfd042c7.rst
+            celery.backends.database.a805d4bd.rst
+            celery.backends.database.dfd042c7.rst
             celery.utils.encoding.rst"
 
 modules=$(find "$PACKAGE" -name "*.py")

docs/internals/reference/index.rst

@@ -50,8 +50,8 @@
     celery.events.snapshot
     celery.events.cursesmon
     celery.events.dumper
-    celery.db.models
-    celery.db.session
+    celery.backends.database.models
+    celery.backends.database.session
     celery.utils
     celery.utils.functional
     celery.utils.term