Skip to content

Commit 6af6b8c

Browse files
committed
upgraded README for 6.0.0
1 parent b9c293d commit 6af6b8c

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

README

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,28 @@ Compatibility
3131
The library is compatible with all Elasticsearch versions since ``1.x`` but you
3232
**have to use a matching major version**:
3333

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

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

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

4343

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

47+
# Elasticsearch 6.x
48+
elasticsearch-dsl>=6.0.0,<7.0.0
49+
4750
# Elasticsearch 5.x
4851
elasticsearch-dsl>=5.0.0,<6.0.0
4952

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

53-
# Elasticsearch 1.x
54-
elasticsearch-dsl<2.0.0
55-
5656

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

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

147147
from datetime import datetime
148-
from elasticsearch_dsl import DocType, Date, Integer, Keyword, Text
149-
from elasticsearch_dsl.connections import connections
148+
from elasticsearch_dsl import DocType, Date, Integer, Keyword, Text, connections
150149

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

0 commit comments

Comments
 (0)