Merge pull request jazzband#224 from MrSenko/django_20

Test with Python 3.6 and Django 2.0

Author: Natim

.travis.yml

@@ -1,21 +1,21 @@
 sudo: false
 language: python
+matrix:
+  include:
+    - python: 2.7
+      env: TOX_ENV=py27-django111
+
+    - python: 3.5
+      env: TOX_ENV=py35-django20
+
+    - python: 3.6
+      env: TOX_ENV=flake8
+    - python: 3.6
+      env: TOX_ENV=py36-django20
 addons:
   apt:
     packages:
       - libenchant-dev
-env:
-    - TOX_ENV=py27-django17
-    - TOX_ENV=py27-django18
-    - TOX_ENV=py27-django19
-    - TOX_ENV=py27-django110
-    - TOX_ENV=py27-django111
-    - TOX_ENV=py34-django17
-    - TOX_ENV=py34-django18
-    - TOX_ENV=py34-django19
-    - TOX_ENV=py34-django110
-    - TOX_ENV=py34-django111
-    - TOX_ENV=flake8
 install:
   - pip install tox
 script:

CHANGELOG.rst

@@ -7,6 +7,9 @@ This document describes changes between each past release.
 2.7.0 (unreleased)
 ==================
 
+- Drop support for Django 1.7, 1.8, 1.9 and 1.10.
+- Django 1.11 is still supported but issues a deprecation warning.
+- Add support for Django 2.0
 - Added INCLUDE_JQUERY setting to decide whether TinyMCE.media should include
   a jQuery release (#190).
 

testtinymce/urls.py

@@ -9,7 +9,7 @@
 
 urlpatterns = [
     url(r'^tinymce/', include(tinymce.urls)),
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
     #url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 
     #    'django.views.static.serve', {"document_root": settings.MEDIA_ROOT}),
 ]

tinymce/views.py

@@ -4,6 +4,12 @@
 import json
 import logging
 
+import django
+if django.VERSION < (2,):  # pragma: no cover
+    import warnings
+    warnings.warn("Support for Django < 2.0 will be removed soon,"
+                  "please upgrade your projects to use Django 2.0", DeprecationWarning)
+
 from django.http import HttpResponse
 from django.shortcuts import render
 from django.utils.encoding import force_text

tox.ini

@@ -1,16 +1,15 @@
 [tox]
 envlist =
-    py27-django{17,18,19,110,111},
-    py34-django{17,18,19,110,111},
+    py27-django{111},
+    py34-django{111},
+    py35-django{2},
+    py36-django{2},
     flake8
 
 [testenv]
 deps =
-    django17: Django>=1.7,<1.8
-    django18: Django>=1.8,<1.9
-    django19: Django>=1.9,<1.10
-    django110: Django>=1.10,<1.11
-    django111: Django>=1.11a,<2.0
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
     coverage
     mock
     pyenchant