Skip to content

Commit

Permalink
Test against Django 1.10b1 (#4210)
Browse files Browse the repository at this point in the history
* Test against Django 1.10b1
* Test against Django master
  • Loading branch information
jpadilla authored and tomchristie committed Jun 23, 2016
1 parent e1f7cc4 commit a20a756
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ env:

matrix:
fast_finish: true
allow_failures:
- TOX_ENV=py27-djangomaster
- TOX_ENV=py34-djangomaster
- TOX_ENV=py35-djangomaster

install:
# Virtualenv < 14 is required to keep the Python 3.2 builds running.
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ envlist =
py27-{lint,docs},
{py27,py32,py33,py34,py35}-django18,
{py27,py34,py35}-django19,
{py27,py34,py35}-django110
{py27,py34,py35}-django110,
{py27,py34,py35}-django{master}

[testenv]
commands = ./runtests.py --fast {posargs} --coverage -rw
Expand All @@ -16,7 +17,8 @@ setenv =
deps =
django18: Django==1.8.13
django19: Django==1.9.7
django110: Django==1.10a1
django110: Django==1.10b1
djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt
basepython =
Expand Down

0 comments on commit a20a756

Please sign in to comment.