prepare 0.13.2

barseghyanartur · barseghyanartur · commit 14bf0a17350b · 2018-08-03T23:32:24.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 *.py,cover
 .idea/
 /vagrant/.vagrant/
+.pytest_cache/
 
 MANIFEST.in~
 MIND_BUCKET.rst
diff --git a/.hgignore b/.hgignore
@@ -12,6 +12,7 @@ syntax: regexp
 \.py,cover
 \.idea/
 ^vagrant/\.vagrant
+^\.pytest_cache/
 
 ^MANIFEST\.in~
 ^tmp/
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -17,10 +17,17 @@ are used for versioning (schema follows below):
 
 0.13.2
 ------
-yyyy-mm-dd (not yet released)
+2018-08-03
 
+- Successfully tested against Python 3.7 and Django 2.1.
 - Unified the base ``BaseSearchFilterBackend`` class.
-- Minor fixes in docs.
+- Minor clean up and fixes in docs.
+- Upgrading test suite to modern versions (``pytest``, ``tox``,
+  ``factory_boy``, ``Faker``). Removing unused dependencies from
+  requirements (``drf-extensions``.
+- Fixed missing PDF generation in offline documentation (non ReadTheDocs).
+  The ``rst2pdf`` package (which does not support Python 3) has been replaced
+  with ``rinohtype`` package (which does support Python 3).
 
 0.13.1
 ------
diff --git a/README.rst b/README.rst
@@ -16,15 +16,28 @@ Elasticsearch documents.
 Prerequisites
 =============
 
-- Django 1.8, 1.9, 1.10, 1.11 and 2.0.
-- Python 2.7, 3.4, 3.5, 3.6
+- Django 1.8, 1.9, 1.10, 1.11, 2.0 and 2.1.
+- Python 2.7, 3.4, 3.5, 3.6, 3.7
 - Elasticsearch 2.x, 5.x, 6.x
 
 Dependencies
 ============
 
-- `django-elasticsearch-dsl <https://pypi.python.org/pypi/django-elasticsearch-dsl>`_
-- `djangorestframework <https://pypi.python.org/pypi/djangorestframework>`_
+**elasticsearch and elasticsearch-dsl**
+
+Depending on your Elasticsearch version (either 2.x, 5.x or 6.x) you should
+use 2.x, 5.x or 6.x versions of the ``elasticsearch`` and ``elasticsearch-dsl``
+packages accordingly.
+
+**django-elasticsearch-dsl**
+
+You are advised to use the latest version of `django-elasticsearch-dsl
+<https://pypi.python.org/pypi/django-elasticsearch-dsl>`_.
+
+**djangorestframework**
+
+Initial version of this package was written for `djangorestframework
+<https://pypi.python.org/pypi/djangorestframework>`_ 3.6.2.
 
 Documentation
 =============
@@ -122,7 +135,7 @@ To test against specific environment, type:
 
 .. code-block:: sh
 
-    tox -e py36-django110
+    tox -e py37-django21
 
 To test just your working environment type:
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -17,10 +17,17 @@ are used for versioning (schema follows below):
 
 0.13.2
 ------
-yyyy-mm-dd (not yet released)
+2018-08-03
 
+- Successfully tested against Python 3.7 and Django 2.1.
 - Unified the base ``BaseSearchFilterBackend`` class.
-- Minor fixes in docs.
+- Minor clean up and fixes in docs.
+- Upgrading test suite to modern versions (``pytest``, ``tox``,
+  ``factory_boy``, ``Faker``). Removing unused dependencies from
+  requirements (``drf-extensions``.
+- Fixed missing PDF generation in offline documentation (non ReadTheDocs).
+  The ``rst2pdf`` package (which does not support Python 3) has been replaced
+  with ``rinohtype`` package (which does support Python 3).
 
 0.13.1
 ------
diff --git a/docs/index.rst b/docs/index.rst
@@ -16,15 +16,28 @@ Elasticsearch documents.
 Prerequisites
 =============
 
-- Django 1.8, 1.9, 1.10, 1.11 and 2.0.
-- Python 2.7, 3.4, 3.5, 3.6
+- Django 1.8, 1.9, 1.10, 1.11, 2.0 and 2.1.
+- Python 2.7, 3.4, 3.5, 3.6, 3.7
 - Elasticsearch 2.x, 5.x, 6.x
 
 Dependencies
 ============
 
-- `django-elasticsearch-dsl <https://pypi.python.org/pypi/django-elasticsearch-dsl>`_
-- `djangorestframework <https://pypi.python.org/pypi/djangorestframework>`_
+**elasticsearch and elasticsearch-dsl**
+
+Depending on your Elasticsearch version (either 2.x, 5.x or 6.x) you should
+use 2.x, 5.x or 6.x versions of the ``elasticsearch`` and ``elasticsearch-dsl``
+packages accordingly.
+
+**django-elasticsearch-dsl**
+
+You are advised to use the latest version of `django-elasticsearch-dsl
+<https://pypi.python.org/pypi/django-elasticsearch-dsl>`_.
+
+**djangorestframework**
+
+Initial version of this package was written for `djangorestframework
+<https://pypi.python.org/pypi/djangorestframework>`_ 3.6.2.
 
 Documentation
 =============
@@ -122,7 +135,7 @@ To test against specific environment, type:
 
 .. code-block:: sh
 
-    tox -e py36-django110
+    tox -e py37-django21
 
 To test just your working environment type:
 
diff --git a/examples/requirements/django_1_10.txt b/examples/requirements/django_1_10.txt
@@ -7,5 +7,4 @@ django-debug-toolbar-force==0.1.1
 django-elasticsearch-debug-toolbar==1.0.4
 django-ormex==0.2
 djangorestframework==3.6.2
-drf-extensions==0.3.1
 sqlparse==0.2.2
diff --git a/examples/requirements/django_1_11.txt b/examples/requirements/django_1_11.txt
@@ -7,5 +7,4 @@ django-debug-toolbar-force==0.1.3
 django-elasticsearch-debug-toolbar==1.2.0
 django-ormex==0.2
 djangorestframework==3.7.7
-drf-extensions==0.3.1
 sqlparse==0.2.2
diff --git a/examples/requirements/django_1_8.txt b/examples/requirements/django_1_8.txt
@@ -7,5 +7,4 @@ django-debug-toolbar-force==0.1.1
 django-elasticsearch-debug-toolbar==1.0.4
 django-ormex==0.2
 djangorestframework==3.6.2
-drf-extensions==0.3.1
 sqlparse==0.1.9
diff --git a/examples/requirements/django_1_9.txt b/examples/requirements/django_1_9.txt
@@ -7,6 +7,5 @@ django-debug-toolbar-force==0.1.1
 django-elasticsearch-debug-toolbar==1.0.4
 django-ormex==0.2
 djangorestframework==3.6.2
-drf-extensions==0.3.1
 sqlparse==0.2.2
 
diff --git a/examples/requirements/django_2_0.txt b/examples/requirements/django_2_0.txt
@@ -7,5 +7,4 @@ django-debug-toolbar-force>=0.1.3
 django-elasticsearch-debug-toolbar>=1.2.0
 django-ormex>=0.2
 djangorestframework==3.7.7
-drf-extensions>=0.3.1
 sqlparse>=0.2.2
diff --git a/examples/requirements/django_2_1.txt b/examples/requirements/django_2_1.txt
@@ -0,0 +1,10 @@
+-r common.txt
+-r test.txt
+
+Django>=2.1,<2.2
+django-debug-toolbar>=1.9.1
+django-debug-toolbar-force>=0.1.3
+django-elasticsearch-debug-toolbar>=1.2.0
+django-ormex>=0.2
+djangorestframework==3.8.2
+sqlparse>=0.2.2
diff --git a/examples/requirements/test.txt b/examples/requirements/test.txt
@@ -1,12 +1,11 @@
-factory_boy==2.7.0
-fake-factory==0.7.2
-Faker==0.7.17
-py==1.4.31
-pytest-cov==2.2.1
-pytest-django==2.9.1
+factory_boy==2.11.1
+Faker==0.8.17
+py==1.5.4
+pytest-cov==2.5.1
+pytest-django==3.3.3
 pytest-ordering==0.5
-pytest==3.0.2
+pytest==3.7.1
 selenium==2.53.6
-tox==2.9.1
+tox==3.1.2
 #coreapi==2.3.3
 #coreschema==0.0.4
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-version = '0.13.1'
+version = '0.13.2'
 
 DOCS_TRANSFORMATIONS = (
     (
@@ -165,6 +165,7 @@
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "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.13.1'
+__version__ = '0.13.2'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2017-2018 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     py{27,34,35,36}-{django18,django19,django110,django111}
     py{35,36}-{django20}
-    py{36}-{django111,django20}-{none,coreapischema}
+    py{36,37}-{django111,django20,django21}-{none,coreapischema}
 
 [testenv]
 envlogdir=
@@ -16,6 +16,7 @@ deps =
     django110: -r{toxinidir}/examples/requirements/django_1_10.txt
     django111: -r{toxinidir}/examples/requirements/django_1_11.txt
     django20: -r{toxinidir}/examples/requirements/django_2_0.txt
+    django21: -r{toxinidir}/examples/requirements/django_2_1.txt
     coreapischema: -r{toxinidir}/examples/requirements/coreapi_coreschema.txt
     none: -r{toxinidir}/examples/requirements/none.txt
 commands =
