aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorTymur Maryokhin2014-11-25 11:09:36 +0100
committerTymur Maryokhin2014-11-25 11:09:36 +0100
commitb6de2660eaa19dbd656215f47b6d24a5cc8bb5b3 (patch)
tree179ef722d8c1698ec934f7d34536d52b9eaed6e7 /tox.ini
parent1fcb495456bebf56b820c89951af285a45383d6f (diff)
downloaddjango-rest-framework-b6de2660eaa19dbd656215f47b6d24a5cc8bb5b3.tar.bz2
Added python 3.2 to test against django master . Related to #2075.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini3
1 files changed, 1 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index b6d94678..b1e03580 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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