Skip to content

Commit

Permalink
upgraded README for 6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
honzakral committed Dec 31, 2017
1 parent b9c293d commit 6af6b8c
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,28 @@ Compatibility
The library is compatible with all Elasticsearch versions since ``1.x`` but you
**have to use a matching major version**:

For **Elasticsearch 5.0** and later, use the major version 5 (``5.x.y``) of the
For **Elasticsearch 6.0** and later, use the major version 5 (``6.x.y``) of the
library.

For **Elasticsearch 2.0** and later, use the major version 2 (``2.x.y``) of the
For **Elasticsearch 5.0** and later, use the major version 5 (``5.x.y``) of the
library.

For **Elasticsearch 1.0** and later, use the major version 0 (``0.x.y``) of the
For **Elasticsearch 2.0** and later, use the major version 2 (``2.x.y``) of the
library.


The recommended way to set your requirements in your `setup.py` or
`requirements.txt` is::

# Elasticsearch 6.x
elasticsearch-dsl>=6.0.0,<7.0.0

# Elasticsearch 5.x
elasticsearch-dsl>=5.0.0,<6.0.0

# Elasticsearch 2.x
elasticsearch-dsl>=2.0.0,<3.0.0

# Elasticsearch 1.x
elasticsearch-dsl<2.0.0


The development is happening on ``master``, ``2.x``, and ``1.x`` branches, respectively.

Expand Down Expand Up @@ -145,8 +145,7 @@ Let's have a simple Python class representing an article in a blogging system:
.. code:: python

from datetime import datetime
from elasticsearch_dsl import DocType, Date, Integer, Keyword, Text
from elasticsearch_dsl.connections import connections
from elasticsearch_dsl import DocType, Date, Integer, Keyword, Text, connections

# Define a default Elasticsearch client
connections.create_connection(hosts=['localhost'])
Expand Down

0 comments on commit 6af6b8c

Please sign in to comment.