Commit d0370a15 authored by Tim Heap's avatar Tim Heap
Browse files

Bump supported versions to Django 1.9+, Wagtail 1.7+

parent 16d57461
......@@ -8,45 +8,23 @@ env:
matrix:
- TOX_ENV=flake8,isort
python:
- 2.7
- 3.4
- 3.5
env:
- DJANGO='19' WAGTAIL='17'
- DJANGO='110' WAGTAIL='17'
- DJANGO='19' WAGTAIL='18'
- DJANGO='110' WAGTAIL='18'
matrix:
- env: DJANGO='18' WAGTAIL='14'
python: 2.7
- env: DJANGO='18' WAGTAIL='14'
python: 3.4
- env: DJANGO='18' WAGTAIL='14'
python: 3.5
- env: DJANGO='19' WAGTAIL='14'
python: 2.7
- env: DJANGO='19' WAGTAIL='14'
python: 3.4
- env: DJANGO='19' WAGTAIL='14'
python: 3.5
- env: DJANGO='18' WAGTAIL='15'
python: 2.7
- env: DJANGO='18' WAGTAIL='15'
python: 3.4
- env: DJANGO='18' WAGTAIL='15'
python: 3.5
- env: DJANGO='19' WAGTAIL='15'
python: 2.7
- env: DJANGO='19' WAGTAIL='15'
python: 3.4
- env: DJANGO='19' WAGTAIL='15'
python: 3.5
- env: DJANGO='19' WAGTAIL='16'
python: 2.7
- env: DJANGO='19' WAGTAIL='16'
python: 3.4
- env: DJANGO='19' WAGTAIL='16'
python: 3.5
- env: DJANGO='110' WAGTAIL='16'
python: 2.7
- env: DJANGO='110' WAGTAIL='16'
python: 3.4
- env: DJANGO='110' WAGTAIL='16'
python: 3.5
- env: TOX_ENV='flake8,isort'
python: 3.5
include:
- env: TOX_ENV='flake8,isort'
python: 3.5
before_install:
# - sudo add-apt-repository ppa:mc3man/trusty-media -y // Inlcudes all multimedia options but 404s currently :(
......
......@@ -8,7 +8,7 @@ html5 compliant codec using ffmpeg.
Requirements
------------
- Wagtail > 1.4
- Wagtail > 1.7
- `ffmpeg <https://ffmpeg.org/>`__
Installing
......
......@@ -18,8 +18,8 @@ setup(
url='https://github.com/takeflight/wagtailvideos',
install_requires=[
'wagtail>=1.4',
'Django>=1.8',
'wagtail>=1.7',
'Django>=1.9',
'django-enumchoicefield==0.6.0',
],
extras_require={
......
......@@ -2,12 +2,7 @@
skip_missing_interpreters = True
envlist =
# Wagtail LTS
py{27,34,35}-dj{18,19}-wt14
# Last version
py{27,34,35}-dj{18,19}-wt15
# Current version
py{27,34,35}-dj{19,110}-wt16
py{27,34,35}-dj{19,110}-wt{17,18}
# Enforce good style
flake8,isort
......@@ -23,10 +18,8 @@ deps =
dj18: Django~=1.8.0
dj19: Django~=1.9.0
dj110: Django~=1.10.0
wt13: wagtail~=1.3.0
wt14: wagtail~=1.4.0
wt15: wagtail~=1.5.0
wt16: wagtail~=1.6.0
wt17: wagtail~=1.7.0
wt18: wagtail~=1.8rc1
[testenv:flake8]
deps = flake8
......
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