Added support for Django 3 (#43)

* add django 3 compatibility

* use cms helper

* pin correct version

* use 3.7 as reference

* pin formtools on Django 1.11

* fix

* added changelog entry

Author: FinalAngel

CHANGELOG.rst

@@ -6,6 +6,7 @@ Changelog
 2.3.1 (unreleased)
 ==================
 
+* Added support for Django 3.0
 * Added further tests to raise coverage
 * Fixed smaller issues found during testing
 

djangocms_file/models.py

@@ -7,7 +7,6 @@
 
 from django.conf import settings
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext
 from django.utils.translation import ugettext_lazy as _
 
@@ -16,6 +15,7 @@
 from djangocms_attributes_field.fields import AttributesField
 from filer.fields.file import FilerFileField
 from filer.fields.folder import FilerFolderField
+from six import python_2_unicode_compatible
 
 
 LINK_TARGET = (

tests/requirements.txt

@@ -1,7 +1,5 @@
-djangocms-helper
+django-app-helper
 tox
 coverage
 isort
 flake8
-# override "pyflakes<2.1" from djangocms-helper
-pyflakes>=2.1.0

tests/settings.py

@@ -18,7 +18,7 @@
 
 
 def run():
-    from djangocms_helper import runner
+    from app_helper import runner
     runner.cms('djangocms_file')
 
 

tox.ini

@@ -41,12 +41,13 @@ known_django = django
 deps =
     -r{toxinidir}/tests/requirements.txt
     dj111: Django>=1.11,<2.0
+    dj111: django-formtools>=2.0,<2.1
     dj21: Django>=2.1,<2.2
     dj22: Django>=2.2,<3.0
     cms34: django-cms>=3.4,<3.5
     cms35: django-cms>=3.5,<3.6
     cms36: django-cms>=3.6,<3.7
-    cms37: https://github.com/divio/django-cms/archive/release/3.7.x.zip
+    cms37: django-cms>=3.7,<3.8
 commands =
     {envpython} --version
     {env:COMMAND:coverage} erase