Skip to content

Commit 81525dc

Browse files
committed
testing against Django 1.5 and 1.6
1 parent 5bf7bb6 commit 81525dc

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

tox.ini

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py26-1.4.X, py27-1.4.X, pypy-1.4.X,
3+
py26-1.5.X, py27-1.5.X, pypy-1.5.X,
44
py26, py27, pypy, py33, docs
55

66
[testenv]
@@ -11,37 +11,43 @@ setenv =
1111
commands =
1212
{envbindir}/django-admin.py test {posargs:tests}
1313

14-
[testenv:py26-1.4.X]
14+
[testenv:py26-1.5.X]
1515
basepython = python2.6
1616
deps =
17-
Django==1.4.2
17+
Django==1.5.1
1818
mock
1919
unittest2
2020
jinja2
2121
futures
2222

23-
[testenv:py27-1.4.X]
23+
[testenv:py27-1.5.X]
2424
basepython = python2.7
2525
deps =
26-
Django==1.4.2
26+
Django==1.5.1
2727
mock
2828
unittest2
2929
jinja2
3030
futures
3131

32-
[testenv:pypy-1.4.X]
32+
[testenv:pypy-1.5.X]
3333
basepython = pypy
3434
deps =
35-
Django==1.4.2
35+
Django==1.5.1
3636
mock
3737
unittest2
3838
jinja2
3939
futures
4040

41+
[testenv:py33-1.5.X]
42+
basepython = python3.3
43+
deps =
44+
jinja2
45+
Django==1.5.1
46+
4147
[testenv:py26]
4248
basepython = python2.6
4349
deps =
44-
Django==1.5
50+
git+git://github.com/django/django.git@stable/1.6.x#egg=Django
4551
mock
4652
unittest2
4753
jinja2
@@ -50,7 +56,7 @@ deps =
5056
[testenv:py27]
5157
basepython = python2.7
5258
deps =
53-
Django==1.5
59+
git+git://github.com/django/django.git@stable/1.6.x#egg=Django
5460
mock
5561
unittest2
5662
jinja2
@@ -59,7 +65,7 @@ deps =
5965
[testenv:pypy]
6066
basepython = pypy
6167
deps =
62-
Django==1.5
68+
git+git://github.com/django/django.git@stable/1.6.x#egg=Django
6369
mock
6470
unittest2
6571
jinja2
@@ -69,7 +75,7 @@ deps =
6975
basepython = python3.3
7076
deps =
7177
jinja2
72-
Django==1.5
78+
git+git://github.com/django/django.git@stable/1.6.x#egg=Django
7379

7480
[testenv:docs]
7581
basepython = python2.7

0 commit comments

Comments
 (0)