From e95845206077a58b0945c9c5c74d3ad244ff603b Mon Sep 17 00:00:00 2001 From: Artur Barseghyan Date: Wed, 26 Jun 2019 22:49:37 +0200 Subject: [PATCH] prepare 0.18 --- CHANGELOG.rst | 13 ++++++++++++ docs/changelog.rst | 13 ++++++++++++ docs/dependencies.rst | 22 ++++++++++++++++++-- docs/installing_elasticsearch.rst | 10 +++++++++ docs_src/dependencies.rst | 22 ++++++++++++++++++-- setup.py | 2 +- src/django_elasticsearch_dsl_drf/__init__.py | 2 +- 7 files changed, 78 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2cdf9778..472e110b 100644 --- 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 index 2cdf9778..472e110b 100644 --- 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 index ec66182c..4091e8eb 100644 --- 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 `_. -**djangorestframework** +**Django/ Django REST Framework** Initial version of this package was written for `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 index 4b0e75f7..58b558e9 100644 --- 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 index ec66182c..4091e8eb 100644 --- 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 `_. -**djangorestframework** +**Django/ Django REST Framework** Initial version of this package was written for `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 index 85c87ba9..79ffa7ef 100644 --- 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 index 3473ec72..f934ec48 100644 --- 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 ' __copyright__ = '2017-2019 Artur Barseghyan' __license__ = 'GPL 2.0/LGPL 2.1'