aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorTymur Maryokhin2014-11-25 12:03:54 +0100
committerTymur Maryokhin2014-11-25 12:03:54 +0100
commitc559ec6da8f983e34ca9a4183e5f632124d77cbc (patch)
tree6a244a8dd1f1bd55f10ee0d986b98ae9dacd28e1 /tox.ini
parent85f5e79cf36cc856ce23c060461472ed92dda999 (diff)
downloaddjango-rest-framework-c559ec6da8f983e34ca9a4183e5f632124d77cbc.tar.bz2
Removed dots in Django versions in tox. Refs #2124.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini24
1 files changed, 12 insertions, 12 deletions
diff --git a/tox.ini b/tox.ini
index b1e03580..a7200a3f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,25 +1,25 @@
[tox]
envlist =
py27-flake8,
- {py26,py27}-django1.4,
- {py26,py27,py32,py33,py34}-django{1.5,1.6},
- {py27,py32,py33,py34}-django{1.7,master}
+ {py26,py27}-django14,
+ {py26,py27,py32,py33,py34}-django{15,16},
+ {py27,py32,py33,py34}-django{17,master}
[testenv]
commands = ./runtests.py --fast
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
- django1.4: django==1.4.11
- django1.5: django==1.5.6
- django1.6: Django==1.6.3
- django1.7: Django==1.7
+ django14: django==1.4.11
+ django15: django==1.5.6
+ django16: Django==1.6.3
+ django17: Django==1.7
djangomaster: https://github.com/django/django/zipball/master
- {py26,py27}-django{1.4,1.5,1.6,1.7}: django-guardian==1.2.3
- {py26,py27}-django{1.4,1.5,1.6}: oauth2==1.5.211
- {py26,py27}-django{1.4,1.5,1.6}: django-oauth-plus==2.2.1
- {py26,py27}-django{1.4,1.5}: django-oauth2-provider==0.2.3
- {py26,py27}-django1.6: django-oauth2-provider==0.2.4
+ {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3
+ {py26,py27}-django{14,15,16}: oauth2==1.5.211
+ {py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1
+ {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3
+ {py26,py27}-django16: django-oauth2-provider==0.2.4
pytest-django==2.6.1
django-filter==0.7
defusedxml==0.3