Removes Django ORM as a broker support

celery · Jun 28, 2016 · 65f982c · 65f982c
1 parent c03ec50
commit 65f982c
Show file tree

Hide file tree

Showing 25 changed files with 0 additions and 496 deletions.
diff --git a/README.rst b/README.rst
@@ -107,8 +107,6 @@ Transport Comparison
 +---------------+----------+------------+------------+---------------+--------------+-----------------------+
 | *in-memory*   | Virtual  | Yes        | Yes [#f1]_ | No            | No           | No                    |
 +---------------+----------+------------+------------+---------------+--------------+-----------------------+
-| *django*      | Virtual  | Yes        | Yes [#f1]_ | No            | No           | No                    |
-+---------------+----------+------------+------------+---------------+--------------+-----------------------+
 | *SLMQ*        | Virtual  | Yes        | Yes [#f1]_ | No            | No           | No                    |
 +---------------+----------+------------+------------+---------------+--------------+-----------------------+
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -19,14 +19,9 @@
     html_favicon='images/favicon.ico',
     html_prepend_sidebars=['sidebardonations.html'],
     extra_extensions=[],
-    configure_django_settings={'DEBUG': False},
     apicheck_ignore_modules=[
         'kombu.entity',
         'kombu.messaging',
-        'kombu.transport.django.management',
-        'kombu.transport.django.management.commands',
-        r'kombu.transport.django.migrations.*',
-        r'kombu.transport.django.south_migrations.*',
         'kombu.async.aws.ext',
         'kombu.async.aws.sqs.ext',
         'kombu.transport.qpid_patches',

diff --git a/docs/includes/introduction.txt b/docs/includes/introduction.txt
@@ -102,8 +102,6 @@ Transport Comparison
 +---------------+----------+------------+------------+---------------+--------------+-----------------------+
 | *in-memory*   | Virtual  | Yes        | Yes [#f1]_ | No            | No           | No                    |
 +---------------+----------+------------+------------+---------------+--------------+-----------------------+
-| *django*      | Virtual  | Yes        | Yes [#f1]_ | No            | No           | No                    |
-+---------------+----------+------------+------------+---------------+--------------+-----------------------+
 | *SLMQ*        | Virtual  | Yes        | Yes [#f1]_ | No            | No           | No                    |
 +---------------+----------+------------+------------+---------------+--------------+-----------------------+
 

diff --git a/docs/reference/index.rst b/docs/reference/index.rst
@@ -50,10 +50,6 @@
     kombu.transport.couchdb
     kombu.transport.zookeeper
     kombu.transport.filesystem
-    kombu.transport.django
-    kombu.transport.django.models
-    kombu.transport.django.managers
-    kombu.transport.django.management.commands.clean_kombu_messages
     kombu.transport.SQS
     kombu.transport.SLMQ
     kombu.transport.pyro

diff --git a/docs/reference/kombu.transport.django.management.commands.clean_kombu_messages.rst b/docs/reference/kombu.transport.django.management.commands.clean_kombu_messages.rst
diff --git a/docs/reference/kombu.transport.django.managers.rst b/docs/reference/kombu.transport.django.managers.rst
diff --git a/docs/reference/kombu.transport.django.models.rst b/docs/reference/kombu.transport.django.models.rst
diff --git a/docs/reference/kombu.transport.django.rst b/docs/reference/kombu.transport.django.rst
diff --git a/docs/userguide/connections.rst b/docs/userguide/connections.rst
@@ -192,8 +192,6 @@ Transport Comparison
 +---------------+----------+------------+------------+---------------+--------------+
 | *in-memory*   | Virtual  | Yes        | Yes [#f1]_ | No            | No           |
 +---------------+----------+------------+------------+---------------+--------------+
-| *django*      | Virtual  | Yes        | Yes [#f1]_ | No            | No           |
-+---------------+----------+------------+------------+---------------+--------------+
 | *SLMQ*        | Virtual  | Yes        | Yes [#f1]_ | No            | No           |
 +---------------+----------+------------+------------+---------------+--------------+
 

diff --git a/funtests/setup.py b/funtests/setup.py
@@ -54,8 +54,6 @@ def run(self, *args, **kwargs):
         'couchdb',
         'kazoo',
         'beanstalkc',
-        'django',
-        'django-kombu',
     ],
     classifiers=[
         'Operating System :: OS Independent',

diff --git a/funtests/tests/test_django.py b/funtests/tests/test_django.py
diff --git a/kombu/tests/__init__.py b/kombu/tests/__init__.py
@@ -56,28 +56,7 @@ def is_in_coverage():
             '--with-coverage3' in sys.argv)
 
 
-def setup_django_env():
-    try:
-        from django.conf import settings
-    except ImportError:
-        return
-
-    if not settings.configured:
-        settings.configure(
-            DATABASES={
-                'default': {
-                    'ENGINE': 'django.db.backends.sqlite3',
-                    'NAME': ':memory:',
-                },
-            },
-            DATABASE_ENGINE='sqlite3',
-            DATABASE_NAME=':memory:',
-            INSTALLED_APPS=('kombu.transport.django',),
-        )
-
-
 def setup():
     # so coverage sees all our modules.
-    setup_django_env()
     if is_in_coverage():
         import_all_modules()
diff --git a/kombu/transport/__init__.py b/kombu/transport/__init__.py
@@ -34,7 +34,6 @@ def supports_librabbitmq():
     'mongodb': 'kombu.transport.mongodb:Transport',
     'couchdb': 'kombu.transport.couchdb:Transport',
     'zookeeper': 'kombu.transport.zookeeper:Transport',
-    'django': 'kombu.transport.django:Transport',
     'SLMQ': 'kombu.transport.SLMQ.Transport',
     'slmq': 'kombu.transport.SLMQ.Transport',
     'filesystem': 'kombu.transport.filesystem:Transport',

diff --git a/kombu/transport/django/__init__.py b/kombu/transport/django/__init__.py
diff --git a/kombu/transport/django/management/__init__.py b/kombu/transport/django/management/__init__.py
diff --git a/kombu/transport/django/management/commands/__init__.py b/kombu/transport/django/management/commands/__init__.py
diff --git a/kombu/transport/django/management/commands/clean_kombu_messages.py b/kombu/transport/django/management/commands/clean_kombu_messages.py
diff --git a/kombu/transport/django/managers.py b/kombu/transport/django/managers.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,8 +107,6 @@ Transport Comparison @@
     +---------------+----------+------------+------------+---------------+--------------+-----------------------+
     | *in-memory*   | Virtual  | Yes        | Yes [#f1]_ | No            | No           | No                    |
     +---------------+----------+------------+------------+---------------+--------------+-----------------------+
-    | *django*      | Virtual  | Yes        | Yes [#f1]_ | No            | No           | No                    |
-    +---------------+----------+------------+------------+---------------+--------------+-----------------------+
     | *SLMQ*        | Virtual  | Yes        | Yes [#f1]_ | No            | No           | No                    |
     +---------------+----------+------------+------------+---------------+--------------+-----------------------+
@@ Expand Down @@