Skip to content

Commit e958452

Browse files
prepare 0.18
1 parent 54f6cb1 commit e958452

File tree

7 files changed

+78
-6
lines changed

7 files changed

+78
-6
lines changed

CHANGELOG.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,19 @@ are used for versioning (schema follows below):
1515
0.3.4 to 0.4).
1616
- All backwards incompatible changes are mentioned in this document.
1717

18+
0.18
19+
----
20+
2019-06-26
21+
22+
.. note::
23+
24+
Support for Django versions prior 1.11 has been dropped.
25+
Support for Django REST Framework prior 3.9 has been dropped.
26+
27+
- Dropping support for Django versions prior 1.11.
28+
- Dropping support for Django REST Framework versions prior 3.9.
29+
- Fix Django REST Framework deprecations.
30+
1831
0.17.7
1932
------
2033
2019-05-30

docs/changelog.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,19 @@ are used for versioning (schema follows below):
1515
0.3.4 to 0.4).
1616
- All backwards incompatible changes are mentioned in this document.
1717

18+
0.18
19+
----
20+
2019-06-26
21+
22+
.. note::
23+
24+
Support for Django versions prior 1.11 has been dropped.
25+
Support for Django REST Framework prior 3.9 has been dropped.
26+
27+
- Dropping support for Django versions prior 1.11.
28+
- Dropping support for Django REST Framework versions prior 3.9.
29+
- Fix Django REST Framework deprecations.
30+
1831
0.17.7
1932
------
2033
2019-05-30

docs/dependencies.rst

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,30 @@ packages accordingly.
1111
You are advised to use the latest version of `django-elasticsearch-dsl
1212
<https://pypi.python.org/pypi/django-elasticsearch-dsl>`_.
1313

14-
**djangorestframework**
14+
**Django/ Django REST Framework**
1515

1616
Initial version of this package was written for `djangorestframework
1717
<https://pypi.python.org/pypi/djangorestframework>`_ 3.6.2.
1818

19-
Tested with the following versions of Django/Django REST Framework:
19+
Starting from version 0.18 support for Django versions prior 1.11 and
20+
Django REST Framework versions prior 3.9 has been dropped.
21+
22+
Current compatibility matrix is:
23+
24+
+--------+-----------------------+
25+
| Django | Django REST Framework |
26+
+--------+-----------------------+
27+
| 1.11 | 3.9.3 |
28+
+--------+-----------------------+
29+
| 2.0 | 3.9.3 |
30+
+--------+-----------------------+
31+
| 2.1 | 3.9.3 |
32+
+--------+-----------------------+
33+
| 2.2 | 3.9.3 |
34+
+--------+-----------------------+
35+
36+
The version 0.17.7 has been tested with the following versions of
37+
Django and Django REST Framework:
2038

2139
+--------+-----------------------+
2240
| Django | Django REST Framework |

docs/installing_elasticsearch.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ Docker
4141
docker pull docker.elastic.co/elasticsearch/elasticsearch:6.4.0
4242
docker run -p 9200:9200 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:6.4.0
4343
44+
7.x
45+
~~~
46+
**7.1.1**
47+
48+
.. code-block:: sh
49+
50+
docker pull docker.elastic.co/elasticsearch/elasticsearch:7.1.1
51+
docker run -p 9200:9200 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:7.1.1
52+
53+
4454
Vagrant
4555
-------
4656
2.x

docs_src/dependencies.rst

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,30 @@ packages accordingly.
1111
You are advised to use the latest version of `django-elasticsearch-dsl
1212
<https://pypi.python.org/pypi/django-elasticsearch-dsl>`_.
1313

14-
**djangorestframework**
14+
**Django/ Django REST Framework**
1515

1616
Initial version of this package was written for `djangorestframework
1717
<https://pypi.python.org/pypi/djangorestframework>`_ 3.6.2.
1818

19-
Tested with the following versions of Django/Django REST Framework:
19+
Starting from version 0.18 support for Django versions prior 1.11 and
20+
Django REST Framework versions prior 3.9 has been dropped.
21+
22+
Current compatibility matrix is:
23+
24+
+--------+-----------------------+
25+
| Django | Django REST Framework |
26+
+--------+-----------------------+
27+
| 1.11 | 3.9.3 |
28+
+--------+-----------------------+
29+
| 2.0 | 3.9.3 |
30+
+--------+-----------------------+
31+
| 2.1 | 3.9.3 |
32+
+--------+-----------------------+
33+
| 2.2 | 3.9.3 |
34+
+--------+-----------------------+
35+
36+
The version 0.17.7 has been tested with the following versions of
37+
Django and Django REST Framework:
2038

2139
+--------+-----------------------+
2240
| Django | Django REST Framework |

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from setuptools import find_packages, setup
44

5-
version = '0.17.7'
5+
version = '0.18'
66

77
DOCS_TRANSFORMATIONS = (
88
(

src/django_elasticsearch_dsl_drf/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"""
44

55
__title__ = 'django-elasticsearch-dsl-drf'
6-
__version__ = '0.17.7'
6+
__version__ = '0.18'
77
__author__ = 'Artur Barseghyan <[email protected]>'
88
__copyright__ = '2017-2019 Artur Barseghyan'
99
__license__ = 'GPL 2.0/LGPL 2.1'

0 commit comments

Comments
 (0)