@@ -31,28 +31,28 @@ Compatibility
31
31
The library is compatible with all Elasticsearch versions since ``1.x`` but you
32
32
**have to use a matching major version**:
33
33
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
35
35
library.
36
36
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
38
38
library.
39
39
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
41
41
library.
42
42
43
43
44
44
The recommended way to set your requirements in your `setup.py` or
45
45
`requirements.txt` is::
46
46
47
+ # Elasticsearch 6.x
48
+ elasticsearch-dsl>=6.0.0,<7.0.0
49
+
47
50
# Elasticsearch 5.x
48
51
elasticsearch-dsl>=5.0.0,<6.0.0
49
52
50
53
# Elasticsearch 2.x
51
54
elasticsearch-dsl>=2.0.0,<3.0.0
52
55
53
- # Elasticsearch 1.x
54
- elasticsearch-dsl<2.0.0
55
-
56
56
57
57
The development is happening on ``master``, ``2.x``, and ``1.x`` branches, respectively.
58
58
@@ -145,8 +145,7 @@ Let's have a simple Python class representing an article in a blogging system:
145
145
.. code:: python
146
146
147
147
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
150
149
151
150
# Define a default Elasticsearch client
152
151
connections.create_connection(hosts=['localhost'])
0 commit comments