Pārlūkot izejas kodu

Removes support for using CouchDB as a broker for lack of resources

Ask Solem 8 gadi atpakaļ
vecāks
revīzija
0614598b33

+ 0 - 5
README.rst

@@ -129,7 +129,6 @@ It supports...
     - **Message Transports**
 
         - RabbitMQ_, Redis_, Amazon SQS
-        - CouchDB_ (experimental),
         - Django ORM (experimental),
         - and more...
 
@@ -155,7 +154,6 @@ It supports...
 
 .. _RabbitMQ: http://rabbitmq.com
 .. _Redis: http://redis.io
-.. _CouchDB: http://couchdb.apache.org
 .. _SQLAlchemy: http://sqlalchemy.org
 
 Framework Integration
@@ -290,9 +288,6 @@ Transports and Backends
 :``celery[cassandra]``:
     for using Apache Cassandra as a result backend with DataStax driver.
 
-:``celery[couchdb]``:
-    for using CouchDB as a message transport (*experimental*).
-
 :``celery[couchbase]``:
     for using Couchbase as a result backend.
 

+ 5 - 9
docs/faq.rst

@@ -184,16 +184,12 @@ Do I have to use AMQP/RabbitMQ?
 
 **Answer**: No.
 
-Although using RabbitMQ is recommended you can also use Redis.  There are also
-experimental transports available such as CouchDB, or using
-SQL databases. See :ref:`brokers` for more information.
+Although using RabbitMQ is recommended you can also use Redis, SQS or Qpid.
+See :ref:`brokers` for more information.
 
-The experimental transports may have reliability problems and
-limited broadcast and event functionality.
-For example remote control commands only works with AMQP and Redis.
-
-Redis or a database won't perform as well as
-an AMQP broker. If you have strict reliability requirements you are
+Redis as a broker won't perform as well as
+an AMQP broker, but the combination RabbitMQ as broker and Redis as a result
+store is commonly used.  If you have strict reliability requirements you are
 encouraged to use RabbitMQ or another AMQP broker. Some transports also uses
 polling, so they are likely to consume more resources. However, if you for
 some reason are not able to use AMQP, feel free to use these alternatives.

+ 0 - 64
docs/getting-started/brokers/couchdb.rst

@@ -1,64 +0,0 @@
-.. _broker-couchdb:
-
-===============
- Using CouchDB
-===============
-
-.. admonition:: Experimental Status
-
-    The CouchDB transport is in need of improvements in many areas and there
-    are several open bugs.  Unfortunately we don't have the resources or funds
-    required to improve the situation, so we're looking for contributors
-    and partners willing to help.
-
-.. _broker-couchdb-installation:
-
-Installation
-============
-
-For the CouchDB support you have to install additional dependencies.
-You can install both Celery and these dependencies in one go using
-the ``celery[couchdb]`` :ref:`bundle <bundles>`:
-
-.. code-block:: console
-
-    $ pip install -U celery[couchdb]
-
-.. _broker-couchdb-configuration:
-
-Configuration
-=============
-
-Configuration is easy, set the transport, and configure the location of
-your CouchDB database:
-
-.. code-block:: python
-
-    broker_url = 'couchdb://localhost:5984/database_name'
-
-Where the URL is in the format of:
-
-.. code-block:: text
-
-    couchdb://userid:password@hostname:port/database_name
-
-The host name will default to ``localhost`` and the port to 5984,
-and so they are optional.  ``userid`` and ``password`` are also optional,
-but needed if your CouchDB server requires authentication.
-
-.. _couchdb-results-configuration:
-
-Results
--------
-
-Storing task state and results in CouchDB is currently **not supported**.
-
-.. _broker-couchdb-limitations:
-
-Limitations
-===========
-
-The CouchDB message transport does not currently support:
-
-    * Remote control commands (:program:`celery inspect`,
-      :program:`celery control`, broadcast)

+ 2 - 8
docs/getting-started/brokers/index.rst

@@ -19,6 +19,7 @@ Broker Instructions
 
     rabbitmq
     redis
+    sqs
 
 Experimental Transports
 =======================
@@ -26,10 +27,7 @@ Experimental Transports
 .. toctree::
     :maxdepth: 1
 
-    sqlalchemy
     django
-    sqs
-    couchdb
 
 .. _broker-overview:
 
@@ -47,16 +45,12 @@ individual transport (see :ref:`broker_toc`).
 +---------------+--------------+----------------+--------------------+
 | *Redis*       | Stable       | Yes            | Yes                |
 +---------------+--------------+----------------+--------------------+
-| *Amazon SQS*  | Experimental | No             | No                 |
-+---------------+--------------+----------------+--------------------+
-| *Couch DB*    | Experimental | No             | No                 |
+| *Amazon SQS*  | Stable       | No             | No                 |
 +---------------+--------------+----------------+--------------------+
 | *Zookeeper*   | Experimental | No             | No                 |
 +---------------+--------------+----------------+--------------------+
 | *Django DB*   | Experimental | No             | No                 |
 +---------------+--------------+----------------+--------------------+
-| *Iron MQ*     | third-party  | No             | No                 |
-+---------------+--------------+----------------+--------------------+
 
 Experimental brokers may be functional but they do not have
 dedicated maintainers.

+ 3 - 5
docs/getting-started/introduction.rst

@@ -119,9 +119,7 @@ Celery is…
         - **Brokers**
 
             - :ref:`RabbitMQ <broker-rabbitmq>`, :ref:`Redis <broker-redis>`,
-            - :ref:`MongoDB <broker-mongodb>` (exp),
-            - :ref:`CouchDB <broker-couchdb>` (exp), :ref:`SQLAlchemy <broker-sqlalchemy>` (exp)
-            - :ref:`Django ORM <broker-django>` (exp), :ref:`Amazon SQS <broker-sqs>`, (exp)
+            - :ref:`Django ORM <broker-django>` (exp), :ref:`Amazon SQS <broker-sqs>`
             - and more…
 
         - **Concurrency**
@@ -133,9 +131,9 @@ Celery is…
         - **Result Stores**
 
             - AMQP, Redis
-            - Memcached, MongoDB
+            - Memcached,
             - SQLAlchemy, Django ORM
-            - Apache Cassandra, IronCache, Elasticsearch
+            - Apache Cassandra, Elasticsearch
 
         - **Serialization**
 

+ 0 - 3
docs/includes/installation.txt

@@ -86,9 +86,6 @@ Transports and Backends
 :``celery[cassandra]``:
     for using Apache Cassandra as a result backend with DataStax driver.
 
-:``celery[couchdb]``:
-    for using CouchDB as a message transport (*experimental*).
-
 :``celery[couchbase]``:
     for using Couchbase as a result backend.
 

+ 0 - 2
docs/includes/introduction.txt

@@ -121,7 +121,6 @@ It supports…
     - **Message Transports**
 
         - RabbitMQ_, Redis_, Amazon SQS
-        - CouchDB_ (experimental),
         - Django ORM (experimental),
         - and more…
 
@@ -147,7 +146,6 @@ It supports…
 
 .. _RabbitMQ: http://rabbitmq.com
 .. _Redis: http://redis.io
-.. _CouchDB: http://couchdb.apache.org
 .. _SQLAlchemy: http://sqlalchemy.org
 
 Framework Integration