Commit 7228a0df by José Padilla

Test against Django's master branch

parent 2e6d39db
......@@ -25,7 +25,18 @@ env:
- TOX_ENV=py26-django15
- TOX_ENV=py27-django14
- TOX_ENV=py26-django14
- TOX_ENV=py27-djangomaster
- TOX_ENV=py32-djangomaster
- TOX_ENV=py33-djangomaster
- TOX_ENV=py34-djangomaster
matrix:
fast_finish: true
allow_failures:
- env: TOX_ENV=py27-djangomaster
- env: TOX_ENV=py32-djangomaster
- env: TOX_ENV=py33-djangomaster
- env: TOX_ENV=py34-djangomaster
install:
- pip install tox
......
......@@ -3,7 +3,7 @@ envlist =
py27-{flake8,docs},
{py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16},
{py27,py32,py33,py34}-django{17,18}
{py27,py32,py33,py34}-django{17,18,master}
[testenv]
commands = ./runtests.py --fast
......@@ -15,6 +15,7 @@ deps =
django16: Django==1.6.3 # Should track minimum supported
django17: Django==1.7.2 # Should track maximum supported
django18: Django==1.8 # Should track maximum supported
djangomaster: https://github.com/django/django/zipball/master
-rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt
......
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