prepare 0.18

barseghyanartur · Jun 26, 2019 · e958452 · e958452
1 parent 54f6cb1
commit e958452
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,6 +15,19 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.18
+----
+2019-06-26
+
+.. note::
+
+    Support for Django versions prior 1.11 has been dropped.
+    Support for Django REST Framework prior 3.9 has been dropped.
+
+- Dropping support for Django versions prior 1.11.
+- Dropping support for Django REST Framework versions prior 3.9.
+- Fix Django REST Framework deprecations.
+
 0.17.7
 ------
 2019-05-30

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -15,6 +15,19 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.18
+----
+2019-06-26
+
+.. note::
+
+    Support for Django versions prior 1.11 has been dropped.
+    Support for Django REST Framework prior 3.9 has been dropped.
+
+- Dropping support for Django versions prior 1.11.
+- Dropping support for Django REST Framework versions prior 3.9.
+- Fix Django REST Framework deprecations.
+
 0.17.7
 ------
 2019-05-30

diff --git a/docs/dependencies.rst b/docs/dependencies.rst
@@ -11,12 +11,30 @@ packages accordingly.
 You are advised to use the latest version of `django-elasticsearch-dsl
 <https://pypi.python.org/pypi/django-elasticsearch-dsl>`_.
 
-**djangorestframework**
+**Django/ Django REST Framework**
 
 Initial version of this package was written for `djangorestframework
 <https://pypi.python.org/pypi/djangorestframework>`_ 3.6.2.
 
-Tested with the following versions of Django/Django REST Framework:
+Starting from version 0.18 support for Django versions prior 1.11 and
+Django REST Framework versions prior 3.9 has been dropped.
+
+Current compatibility matrix is:
+
++--------+-----------------------+
+| Django | Django REST Framework |
++--------+-----------------------+
+| 1.11   | 3.9.3                 |
++--------+-----------------------+
+| 2.0    | 3.9.3                 |
++--------+-----------------------+
+| 2.1    | 3.9.3                 |
++--------+-----------------------+
+| 2.2    | 3.9.3                 |
++--------+-----------------------+
+
+The version 0.17.7 has been tested with the following versions of
+Django and Django REST Framework:
 
 +--------+-----------------------+
 | Django | Django REST Framework |

diff --git a/docs/installing_elasticsearch.rst b/docs/installing_elasticsearch.rst
@@ -41,6 +41,16 @@ Docker
     docker pull docker.elastic.co/elasticsearch/elasticsearch:6.4.0
     docker run -p 9200:9200 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:6.4.0
 
+7.x
+~~~
+**7.1.1**
+
+.. code-block:: sh
+
+    docker pull docker.elastic.co/elasticsearch/elasticsearch:7.1.1
+    docker run -p 9200:9200 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:7.1.1
+
+
 Vagrant
 -------
 2.x

diff --git a/docs_src/dependencies.rst b/docs_src/dependencies.rst
@@ -11,12 +11,30 @@ packages accordingly.
 You are advised to use the latest version of `django-elasticsearch-dsl
 <https://pypi.python.org/pypi/django-elasticsearch-dsl>`_.
 
-**djangorestframework**
+**Django/ Django REST Framework**
 
 Initial version of this package was written for `djangorestframework
 <https://pypi.python.org/pypi/djangorestframework>`_ 3.6.2.
 
-Tested with the following versions of Django/Django REST Framework:
+Starting from version 0.18 support for Django versions prior 1.11 and
+Django REST Framework versions prior 3.9 has been dropped.
+
+Current compatibility matrix is:
+
++--------+-----------------------+
+| Django | Django REST Framework |
++--------+-----------------------+
+| 1.11   | 3.9.3                 |
++--------+-----------------------+
+| 2.0    | 3.9.3                 |
++--------+-----------------------+
+| 2.1    | 3.9.3                 |
++--------+-----------------------+
+| 2.2    | 3.9.3                 |
++--------+-----------------------+
+
+The version 0.17.7 has been tested with the following versions of
+Django and Django REST Framework:
 
 +--------+-----------------------+
 | Django | Django REST Framework |

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-version = '0.17.7'
+version = '0.18'
 
 DOCS_TRANSFORMATIONS = (
     (

diff --git a/src/django_elasticsearch_dsl_drf/__init__.py b/src/django_elasticsearch_dsl_drf/__init__.py
@@ -3,7 +3,7 @@
 """
 
 __title__ = 'django-elasticsearch-dsl-drf'
-__version__ = '0.17.7'
+__version__ = '0.18'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'