Support Django 1.11 and fix tests

.gitignore

 *.pyc
 *.egg-info
+.*.swp
 dist/
 ./settings.py
 venv/

.travis.yml

@@ -10,14 +10,15 @@ env:
 
 
 python:
-  - 2.7
   - 3.4
   - 3.5
+  - 3.6
 
 env:
-  - DJANGO='110' WAGTAIL='19'
-  - DJANGO='110' WAGTAIL='110'
-  - DJANGO='111' WAGTAIL='110'
+  - DJANGO='111' WAGTAIL='20'
+  - DJANGO='111' WAGTAIL='21'
+  - DJANGO='20' WAGTAIL='20'
+  - DJANGO='20' WAGTAIL='21'
 
 
 matrix:
@@ -26,7 +27,7 @@ matrix:
       python: 3.5
 
 before_install:
-    # - sudo add-apt-repository ppa:mc3man/trusty-media -y // Inlcudes all multimedia options but 404s currently :(
+    - sudo add-apt-repository ppa:mc3man/trusty-media -y
     - sudo apt-get update -qq
     - sudo apt-get install ffmpeg -y
 

README.rst

@@ -8,7 +8,7 @@ html5 compliant codec using ffmpeg.
 Requirements
 ------------
 
--  Wagtail > 2.0
+-  Wagtail >= 2.0
 -  `ffmpeg <https://ffmpeg.org/>`__
 
 Installing

setup.py

@@ -19,8 +19,8 @@ setup(
 
     install_requires=[
         'wagtail>=2.0',
-        'Django>=2.0',
-        'django-enumchoicefield==0.6.0',
+        'Django>=1.11',
+        'django-enumchoicefield==1.0.0',
     ],
     extras_require={
         'testing': [
@@ -42,11 +42,10 @@ setup(
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Framework :: Django',
         'License :: OSI Approved :: BSD License',
     ],

tests/app/settings.py

@@ -41,7 +41,7 @@ DEBUG = True
 USE_TZ = True
 TIME_ZONE = 'Australia/Hobart'
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',

tests/storage.py

 import errno
 import os
-import warnings
 from datetime import datetime
 
 from django.conf import settings
@@ -10,7 +9,6 @@ from django.core.files.storage import FileSystemStorage
 from django.utils import timezone
 from django.utils._os import safe_join
 from django.utils.deconstruct import deconstructible
-from django.utils.deprecation import RemovedInDjango20Warning
 from django.utils.encoding import filepath_to_uri, force_text
 from django.utils.six.moves.urllib.parse import urljoin
 

tox.ini

@@ -2,7 +2,7 @@
 skip_missing_interpreters = True
 
 envlist =
-	py{34,35,36}-dj{20}-wt{20}
+	py{34,35,36}-dj{110,20}-wt{20,21}
 	# Enforce good style
 	flake8,isort
 
@@ -15,8 +15,10 @@ pip_pre = True
 
 deps =
 	{[base]deps}
+	dj111: Django~=1.11.0
 	dj20: Django~=2.0.0
 	wt20: wagtail~=2.0.0
+	wt21: wagtail~=2.1.0
 
 [testenv:flake8]
 deps = flake8

wagtailvideos/urls.py

@@ -2,8 +2,8 @@ from django.conf.urls import url
 
 from wagtailvideos.views import chooser, multiple, videos
 
+app_name = 'wagtailvideos'
 urlpatterns = [
-
     url(r'^$', videos.index, name='index'),
     url(r'^(\d+)/$', videos.edit, name='edit'),
     url(r'^(\d+)/delete/$', videos.delete, name='delete'),