Commit 6d6345f6 authored by Liam Brenner's avatar Liam Brenner Committed by Tim Heap
Browse files

Added django 1.10 compatability

parent e9a84869
...@@ -13,9 +13,11 @@ env: ...@@ -13,9 +13,11 @@ env:
- TOX_ENV= - TOX_ENV=
matrix: matrix:
- DJANGO='18' WAGTAIL='14' - DJANGO='18' WAGTAIL='14'
- DJANGO='19' WAGTAIL='14'
- DJANGO='18' WAGTAIL='15' - DJANGO='18' WAGTAIL='15'
- DJANGO='19' WAGTAIL='14'
- DJANGO='19' WAGTAIL='15' - DJANGO='19' WAGTAIL='15'
- DJANGO='110' WAGTAIL='14'
- DJANGO='110' WAGTAIL='15'
before_install: 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 // Inlcudes all multimedia options but 404s currently :(
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
skip_missing_interpreters = True skip_missing_interpreters = True
envlist = envlist =
py{27,34,35}-dj{18,19}-wt{14,15} py{27,34,35}-dj{18,19,110}-wt{14,15}
[testenv] [testenv]
...@@ -19,6 +19,7 @@ deps = ...@@ -19,6 +19,7 @@ deps =
mock mock
dj18: Django~=1.8.0 dj18: Django~=1.8.0
dj19: Django~=1.9.0 dj19: Django~=1.9.0
dj110: Django~=1.10.0
wt13: wagtail~=1.3.0 wt13: wagtail~=1.3.0
wt14: wagtail~=1.4.0 wt14: wagtail~=1.4.0
wt15: wagtail~=1.5.0 wt15: wagtail~=1.5.0
...@@ -4,9 +4,7 @@ import mimetypes ...@@ -4,9 +4,7 @@ import mimetypes
from django import template from django import template
from django.forms.widgets import flatatt from django.forms.widgets import flatatt
from django.template import resolve_variable
from django.utils.text import mark_safe from django.utils.text import mark_safe
from wagtailvideos.models import MediaFormats, Video from wagtailvideos.models import MediaFormats, Video
register = template.Library() register = template.Library()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment