diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | tox.ini | 24 |
2 files changed, 33 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index a5b6d7d9..4c06acf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,16 @@ env: - TOX_ENV=py2.6-django1.5 - TOX_ENV=py2.7-django1.4 - TOX_ENV=py2.6-django1.4 + - TOX_ENV=py3.4-djangomaster + - TOX_ENV=py3.3-djangomaster + - TOX_ENV=py2.7-djangomaster + +matrix: + fast_finish: true + allow_failures: + - env: TOX_ENV=py3.4-djangomaster + - env: TOX_ENV=py3.3-djangomaster + - env: TOX_ENV=py2.7-djangomaster install: - "pip install tox --download-cache $HOME/.pip-cache" @@ -5,7 +5,8 @@ envlist = py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7, py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6, py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5, - py2.7-django1.4,py2.6-django1.4 + py2.7-django1.4,py2.6-django1.4, + py3.4-djangomaster,py3.3-djangomaster,py2.7-djangomaster [testenv] commands = ./runtests.py --fast @@ -157,3 +158,24 @@ deps = django==1.4.11 django-oauth2-provider==0.2.3 django-guardian==1.2.3 pytest-django==2.6.1 + +[testenv:py3.4-djangomaster] +basepython = python3.4 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 + +[testenv:py3.3-djangomaster] +basepython = python3.3 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 + +[testenv:py2.7-djangomaster] +basepython = python3.2 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 |