Prepare 0.20.4

barseghyanartur · Dec 25, 2019 · a2214fd · a2214fd
1 parent f0fb7e4
commit a2214fd
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -51,10 +51,6 @@ before_install:
   - echo "deb $ES_APT_URL stable main" | sudo tee -a /etc/apt/sources.list.d/elk.list
   - sudo apt-get remove --purge elasticsearch -y
   - sudo apt-get update && sudo apt-get install elasticsearch -y
-#  - "sudo echo 'xpack.security.enabled: false' > /etc/elasticsearch/elasticsearch.yml"
-#  - "sudo echo 'http.host: 0.0.0.0' >> /etc/elasticsearch/elasticsearch.yml"
-#  - "sudo echo 'transport.host: 127.0.0.1' >> /etc/elasticsearch/elasticsearch.yml"
-#  - "sudo echo discovery.type: single-node' >> /etc/elasticsearch/elasticsearch.yml"
   - sudo -i service elasticsearch restart
 
 install: pip install -r examples/requirements/test.txt

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -17,8 +17,11 @@ are used for versioning (schema follows below):
 
 0.20.4
 ------
-2019-09-20 (not yet released)
+2019-12-25
 
+- Tested against Django 3.0.
+- Tested against Python 3.8.
+- Tested against Django REST Framework 3.11.
 - Minor fixes.
 - Test optimisations.
 

diff --git a/README.rst b/README.rst
@@ -46,8 +46,8 @@ Make sure to read `FAQ <https://github.com/barseghyanartur/django-elasticsearch-
 
 Prerequisites
 =============
-- Django 1.11, 2.0, 2.1 and 2.2.
-- Python 2.7, 3.5, 3.6, 3.7.
+- Django 1.11, 2.0, 2.1, 2.2 and 3.0.
+- Python 2.7, 3.5, 3.6, 3.7, 3.8.
 - Elasticsearch 6.x, 7.x. For older versions use
   ``django-elasticsearch-dsl-drf`` version 0.18.
 
@@ -162,7 +162,7 @@ To test against specific environment, type:
 
 .. code-block:: sh
 
-    tox -e py37-django21
+    tox -e py38-django30
 
 To test just your working environment type:
 

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -17,8 +17,11 @@ are used for versioning (schema follows below):
 
 0.20.4
 ------
-2019-09-20 (not yet released)
+2019-12-25
 
+- Tested against Django 3.0.
+- Tested against Python 3.8.
+- Tested against Django REST Framework 3.11.
 - Minor fixes.
 - Test optimisations.
 

diff --git a/docs/dependencies.rst b/docs/dependencies.rst
@@ -11,11 +11,11 @@ Current compatibility matrix is:
 +--------------+---------------+
 | This package | Elasticsearch |
 +--------------+---------------+
-| 0.20         | 6.x, 7.x      |
+| 0.20.x       | 6.x, 7.x      |
 +--------------+---------------+
-| 0.19         | 6.x           |
+| 0.19.x       | 6.x           |
 +--------------+---------------+
-| 0.18         | 2.x, 5.x, 6.x |
+| 0.18.x       | 2.x, 5.x, 6.x |
 +--------------+---------------+
 
 **django-elasticsearch-dsl**
@@ -64,6 +64,8 @@ Current compatibility matrix is:
 +--------+-----------------------+
 | 2.2    | 3.9.3                 |
 +--------+-----------------------+
+| 3.0    | 3.11.0                 |
++--------+-----------------------+
 
 The version 0.17.7 has been tested with the following versions of
 Django and Django REST Framework:

diff --git a/docs/index.rst b/docs/index.rst
@@ -46,8 +46,8 @@ Make sure to read `FAQ <https://github.com/barseghyanartur/django-elasticsearch-
 
 Prerequisites
 =============
-- Django 1.11, 2.0, 2.1 and 2.2.
-- Python 2.7, 3.5, 3.6, 3.7.
+- Django 1.11, 2.0, 2.1, 2.2 and 3.0.
+- Python 2.7, 3.5, 3.6, 3.7, 3.8.
 - Elasticsearch 6.x, 7.x. For older versions use
   ``django-elasticsearch-dsl-drf`` version 0.18.
 
@@ -162,7 +162,7 @@ To test against specific environment, type:
 
 .. code-block:: sh
 
-    tox -e py37-django21
+    tox -e py38-django30
 
 To test just your working environment type:
 

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-version = '0.20.3'
+version = '0.20.4'
 
 DOCS_TRANSFORMATIONS = (
     (
@@ -186,6 +186,7 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Environment :: Web Environment",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "License :: OSI Approved :: GNU Lesser General Public License v2 or "

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.20.3'
+__version__ = '0.20.4'
 __author__ = 'Artur Barseghyan <[email protected]>'
 __copyright__ = '2017-2019 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'