Skip to content

Commit 84d93af

Browse files
GlenRSmithdakrone
authored andcommitted
Update version information (#25226)
Bump current major version to 5, reflect bifurcation of packages.
1 parent 26d7ba4 commit 84d93af

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

docs/python/index.asciidoc

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,33 @@ It can be installed with pip:
3636
pip install elasticsearch
3737
------------------------------------
3838

39+
The legacy version for Elasticsearch version 2.x can be installed with pip:
40+
41+
[source,sh]
42+
------------------------------------
43+
pip install elasticsearch2
44+
------------------------------------
45+
3946
=== Versioning
4047

41-
There are two branches for development - `master` and `1.x`. Master branch is
42-
used to track all the changes for Elasticsearch 2.0 and beyond whereas 1.x
43-
tracks Elasticsearch 1.*.
48+
Current development happens in the master branch.
49+
50+
The master branch is the only branch under current development and
51+
is used to track all the changes for Elasticsearch 5.x and beyond.
4452

45-
Releases with major version 1 (1.X.Y) are to be used with Elasticsearch 1.* and
46-
later, 0.4 releases are meant to work with Elasticsearch 0.90.*.
53+
Elasticsearch version 2.x is not longer under active development.
54+
We will only backport severe bug fixes.
4755

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

5159
[source,txt]
5260
------------------------------------
53-
# Elasticsearch 2.x
54-
elasticsearch>=2.0.0,<3.0.0
61+
# Elasticsearch 5.x
62+
elasticsearch>=5.0.0,<6.0.0
5563
56-
# Elasticsearch 1.x
57-
elasticsearch>=1.0.0,<2.0.0
64+
# Elasticsearch 2.x
65+
elasticsearch2
5866
------------------------------------
5967

6068
=== Example use
@@ -112,7 +120,7 @@ some of the more engaging tasks like bulk indexing and reindexing.
112120

113121
=== License
114122

115-
Copyright 2013-2016 Elasticsearch
123+
Copyright 2013-2017 Elasticsearch
116124

117125
Licensed under the Apache License, Version 2.0 (the "License");
118126
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)