Merge 831f51a into 0c58ec6

javrasya · Feb 3, 2020 · 0d0eef3 · 0d0eef3
2 parents 0c58ec6 + 831f51a
commit 0d0eef3
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,8 @@ matrix:
       env: TOXENV=py36-dj2.1-sqlite3
     - python: "3.6"
       env: TOXENV=py36-dj2.2-sqlite3
+    - python: "3.6"
+      env: TOXENV=py36-dj3.0-sqlite3
     - python: "3.6"
       env: TOXENV=cov
     - python: "3.6"

diff --git a/README.rst b/README.rst
@@ -80,7 +80,7 @@ A very modern admin with some user friendly interfaces that is called `River Adm
 Requirements
 ------------
 * Python (``2.7``, ``3.4``, ``3.5``, ``3.6``)
-* Django (``1.11``, ``2.0``, ``2.1``, ``2.2``)
+* Django (``1.11``, ``2.0``, ``2.1``, ``2.2``,``3.0``)
 * ``Django`` >= 2.0 is supported for ``Python`` >= 3.5
 
 Supported (Tested) Databases:

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -3,8 +3,16 @@
 Change Logs
 ===========
 
-3.1.2 (Stable):
+3.1.3 (Stable):
 ---------------
+    * **Improvement** -  # 135_: Support Django 3.0
+
+
+.. _135: https://github.com/javrasya/django-river/issues/135
+
+
+3.1.2:
+------
     * **Improvement** -  # 133_: Support MySQL 8.0
 
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.2'
+version = '3.1.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.2'
+release = '3.1.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/overview.rst b/docs/overview.rst
@@ -16,7 +16,7 @@ There is ordering aprovments for a transition functionality in ``django-river``.
 Requirements
 ------------
 * Python (``2.7``, ``3.4``, ``3.5``, ``3.6``)
-* Django (``1.11``, ``2.0``, ``2.1``, ``2.2``)
+* Django (``1.11``, ``2.0``, ``2.1``, ``2.2``, ``3.0``)
 * ``Django`` >= 2.0 is supported for ``Python`` >= 3.5
 
 

diff --git a/river/models/state.py b/river/models/state.py
@@ -3,7 +3,12 @@
 from django.db import models
 from django.db.models.signals import pre_save
 from django.template.defaultfilters import slugify
-from django.utils.encoding import python_2_unicode_compatible
+
+try:
+    from django.utils.encoding import python_2_unicode_compatible
+except ImportError:
+    from six import python_2_unicode_compatible
+
 from django.utils.translation import ugettext_lazy as _
 
 from river.models.base_model import BaseModel

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name='django-river',
-    version='3.1.2',
+    version='3.1.3',
     author='Ahmet DAL',
     author_email='ceahmetdal@gmail.com',
     packages=find_packages(),

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist = {py27,py34}-{dj1.11}-{sqlite3},
           {py35}-{dj1.11,dj2.0,dj2.1,dj2.2}-{sqlite3},
-          {py36}-{dj1.11,dj2.0,dj2.1,dj2.2}-{sqlite3},
+          {py36}-{dj1.11,dj2.0,dj2.1,dj2.2,dj3.0}-{sqlite3},
           {py36}-{dj2.2}-{postgresql9,postgresql10,postgresql11,postgresql12},
           {py36}-{dj2.2}-{mysql8.0},
           cov,
@@ -26,13 +26,14 @@ setenv =
     postgresql9,postgresql10,postgresql11,postgresql12: DJANGO_SETTINGS_MODULE=settings.with_postgresql
     mysql8.0: DJANGO_SETTINGS_MODULE=settings.with_mysql
 deps =
-    {dj1.11,dj2.0,dj2.1,dj2.2}: pytest-django>3.1.2
+    pytest-django>3.1.2
     pytest-cov
     -rrequirements.txt
     dj1.11: Django>=1.11,<1.12.0
     dj2.0: Django>=2.0,<2.1.0
     dj2.1: Django>=2.1,<2.2.0
     dj2.2: Django>=2.2,<2.3.0
+    dj3.0: Django>=3.0,<3.1.0
     postgresql9,postgresql10,postgresql11,postgresql12: psycopg2
     mysql8.0: mysqlclient
 commands =