diff options
| author | Tymur Maryokhin | 2014-11-25 11:09:36 +0100 |
|---|---|---|
| committer | Tymur Maryokhin | 2014-11-25 11:09:36 +0100 |
| commit | b6de2660eaa19dbd656215f47b6d24a5cc8bb5b3 (patch) | |
| tree | 179ef722d8c1698ec934f7d34536d52b9eaed6e7 | |
| parent | 1fcb495456bebf56b820c89951af285a45383d6f (diff) | |
| download | django-rest-framework-b6de2660eaa19dbd656215f47b6d24a5cc8bb5b3.tar.bz2 | |
Added python 3.2 to test against django master . Related to #2075.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | tox.ini | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index e19efdba..2791df6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ env: - TOX_ENV=py26-django1.4 - TOX_ENV=py34-djangomaster - TOX_ENV=py33-djangomaster + - TOX_ENV=py32-djangomaster - TOX_ENV=py27-djangomaster matrix: @@ -29,6 +30,7 @@ matrix: allow_failures: - env: TOX_ENV=py34-djangomaster - env: TOX_ENV=py33-djangomaster + - env: TOX_ENV=py32-djangomaster - env: TOX_ENV=py27-djangomaster install: @@ -3,8 +3,7 @@ envlist = py27-flake8, {py26,py27}-django1.4, {py26,py27,py32,py33,py34}-django{1.5,1.6}, - {py27,py32,py33,py34}-django1.7, - {py27,py33,py34}-djangomaster + {py27,py32,py33,py34}-django{1.7,master} [testenv] commands = ./runtests.py --fast |