Skip to content

Commit a2214fd

Browse files
Prepare 0.20.4
1 parent f0fb7e4 commit a2214fd

File tree

8 files changed

+22
-17
lines changed

8 files changed

+22
-17
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ before_install:
5151
- echo "deb $ES_APT_URL stable main" | sudo tee -a /etc/apt/sources.list.d/elk.list
5252
- sudo apt-get remove --purge elasticsearch -y
5353
- sudo apt-get update && sudo apt-get install elasticsearch -y
54-
# - "sudo echo 'xpack.security.enabled: false' > /etc/elasticsearch/elasticsearch.yml"
55-
# - "sudo echo 'http.host: 0.0.0.0' >> /etc/elasticsearch/elasticsearch.yml"
56-
# - "sudo echo 'transport.host: 127.0.0.1' >> /etc/elasticsearch/elasticsearch.yml"
57-
# - "sudo echo discovery.type: single-node' >> /etc/elasticsearch/elasticsearch.yml"
5854
- sudo -i service elasticsearch restart
5955

6056
install: pip install -r examples/requirements/test.txt

CHANGELOG.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ are used for versioning (schema follows below):
1717

1818
0.20.4
1919
------
20-
2019-09-20 (not yet released)
20+
2019-12-25
2121

22+
- Tested against Django 3.0.
23+
- Tested against Python 3.8.
24+
- Tested against Django REST Framework 3.11.
2225
- Minor fixes.
2326
- Test optimisations.
2427

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Make sure to read `FAQ <https://github.com/barseghyanartur/django-elasticsearch-
4646

4747
Prerequisites
4848
=============
49-
- Django 1.11, 2.0, 2.1 and 2.2.
50-
- Python 2.7, 3.5, 3.6, 3.7.
49+
- Django 1.11, 2.0, 2.1, 2.2 and 3.0.
50+
- Python 2.7, 3.5, 3.6, 3.7, 3.8.
5151
- Elasticsearch 6.x, 7.x. For older versions use
5252
``django-elasticsearch-dsl-drf`` version 0.18.
5353

@@ -162,7 +162,7 @@ To test against specific environment, type:
162162

163163
.. code-block:: sh
164164
165-
tox -e py37-django21
165+
tox -e py38-django30
166166
167167
To test just your working environment type:
168168

docs/changelog.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ are used for versioning (schema follows below):
1717

1818
0.20.4
1919
------
20-
2019-09-20 (not yet released)
20+
2019-12-25
2121

22+
- Tested against Django 3.0.
23+
- Tested against Python 3.8.
24+
- Tested against Django REST Framework 3.11.
2225
- Minor fixes.
2326
- Test optimisations.
2427

docs/dependencies.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ Current compatibility matrix is:
1111
+--------------+---------------+
1212
| This package | Elasticsearch |
1313
+--------------+---------------+
14-
| 0.20 | 6.x, 7.x |
14+
| 0.20.x | 6.x, 7.x |
1515
+--------------+---------------+
16-
| 0.19 | 6.x |
16+
| 0.19.x | 6.x |
1717
+--------------+---------------+
18-
| 0.18 | 2.x, 5.x, 6.x |
18+
| 0.18.x | 2.x, 5.x, 6.x |
1919
+--------------+---------------+
2020

2121
**django-elasticsearch-dsl**
@@ -64,6 +64,8 @@ Current compatibility matrix is:
6464
+--------+-----------------------+
6565
| 2.2 | 3.9.3 |
6666
+--------+-----------------------+
67+
| 3.0 | 3.11.0 |
68+
+--------+-----------------------+
6769

6870
The version 0.17.7 has been tested with the following versions of
6971
Django and Django REST Framework:

docs/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Make sure to read `FAQ <https://github.com/barseghyanartur/django-elasticsearch-
4646

4747
Prerequisites
4848
=============
49-
- Django 1.11, 2.0, 2.1 and 2.2.
50-
- Python 2.7, 3.5, 3.6, 3.7.
49+
- Django 1.11, 2.0, 2.1, 2.2 and 3.0.
50+
- Python 2.7, 3.5, 3.6, 3.7, 3.8.
5151
- Elasticsearch 6.x, 7.x. For older versions use
5252
``django-elasticsearch-dsl-drf`` version 0.18.
5353

@@ -162,7 +162,7 @@ To test against specific environment, type:
162162

163163
.. code-block:: sh
164164
165-
tox -e py37-django21
165+
tox -e py38-django30
166166
167167
To test just your working environment type:
168168

setup.py

Lines changed: 2 additions & 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.20.3'
5+
version = '0.20.4'
66

77
DOCS_TRANSFORMATIONS = (
88
(
@@ -186,6 +186,7 @@
186186
"Programming Language :: Python :: 3.5",
187187
"Programming Language :: Python :: 3.6",
188188
"Programming Language :: Python :: 3.7",
189+
"Programming Language :: Python :: 3.8",
189190
"Environment :: Web Environment",
190191
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
191192
"License :: OSI Approved :: GNU Lesser General Public License v2 or "

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.20.3'
6+
__version__ = '0.20.4'
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)