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

Update travis and tox configs to test all compatible versions

parent 6d6345f6
...@@ -13,11 +13,11 @@ env: ...@@ -13,11 +13,11 @@ env:
- TOX_ENV= - TOX_ENV=
matrix: matrix:
- DJANGO='18' WAGTAIL='14' - DJANGO='18' WAGTAIL='14'
- DJANGO='18' WAGTAIL='15'
- DJANGO='19' WAGTAIL='14' - DJANGO='19' WAGTAIL='14'
- DJANGO='18' WAGTAIL='15'
- DJANGO='19' WAGTAIL='15' - DJANGO='19' WAGTAIL='15'
- DJANGO='110' WAGTAIL='14' - DJANGO='19' WAGTAIL='16'
- DJANGO='110' WAGTAIL='15' - DJANGO='110' WAGTAIL='16'
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,19 +2,18 @@ ...@@ -2,19 +2,18 @@
skip_missing_interpreters = True skip_missing_interpreters = True
envlist = envlist =
py{27,34,35}-dj{18,19,110}-wt{14,15} # 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
[testenv] [testenv]
commands=python runtests.py {posargs} commands = python runtests.py {posargs}
usedevelop = True
pip_pre = True pip_pre = True
basepython =
py27: python2.7
py34: python3.4
py35: python3.5
deps = deps =
mock mock
dj18: Django~=1.8.0 dj18: Django~=1.8.0
...@@ -23,3 +22,4 @@ deps = ...@@ -23,3 +22,4 @@ deps =
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
wt16: wagtail~=1.6.0
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