Skip to content

Commit 0584a0d

Browse files
committed
Added PYPY and Django 1.7rc1 to tox tests
1 parent 9784381 commit 0584a0d

File tree

1 file changed

+39
-7
lines changed

1 file changed

+39
-7
lines changed

tox.ini

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,24 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py26, py27, py32, py33, py26-django-1.4, py27-django-1.4, py26-django-1.5, py27-django-1.5, py32-django-1.5, py33-django-1.5, doc
7+
envlist = py26, py27, py32, py33, pypy,
8+
py26-django-1.4, py27-django-1.4, pypy-django-1.4,
9+
py26-django-1.5, py27-django-1.5, py32-django-1.5, py33-django-1.5, pypy-django-1.5,
10+
py26-django-1.7, py27-django-1.7, py32-django-1.7, py33-django-1.7, pypy-django-1.7,
11+
doc
812

913
[testenv]
1014
commands = {envpython} manage.py test djangojs
11-
deps =
12-
django>=1.6
15+
deps = django>=1.6
1316

1417
[django-1.5]
15-
deps =
16-
django>=1.5,<1.6
18+
deps = django>=1.5,<1.6
1719

1820
[django-1.4]
19-
deps =
20-
django>=1.4,<1.5
21+
deps = django>=1.4,<1.5
22+
23+
[django-1.7]
24+
deps = https://www.djangoproject.com/download/1.7c1/tarball/
2125

2226
[testenv:py26-django-1.4]
2327
basepython = python2.6
@@ -27,6 +31,10 @@ deps = {[django-1.4]deps}
2731
basepython = python2.7
2832
deps = {[django-1.4]deps}
2933

34+
[testenv:pypy-django-1.4]
35+
basepython = pypy
36+
deps = {[django-1.4]deps}
37+
3038
[testenv:py26-django-1.5]
3139
basepython = python2.6
3240
deps = {[django-1.5]deps}
@@ -43,6 +51,30 @@ deps = {[django-1.5]deps}
4351
basepython = python3.3
4452
deps = {[django-1.5]deps}
4553

54+
[testenv:pypy-django-1.5]
55+
basepython = pypy
56+
deps = {[django-1.5]deps}
57+
58+
[testenv:py26-django-1.7]
59+
basepython = python2.6
60+
deps = {[django-1.7]deps}
61+
62+
[testenv:py27-django-1.7]
63+
basepython = python2.7
64+
deps = {[django-1.7]deps}
65+
66+
[testenv:py32-django-1.7]
67+
basepython = python3.2
68+
deps = {[django-1.7]deps}
69+
70+
[testenv:py33-django-1.7]
71+
basepython = python3.3
72+
deps = {[django-1.7]deps}
73+
74+
[testenv:pypy-django-1.7]
75+
basepython = pypy
76+
deps = {[django-1.7]deps}
77+
4678
[testenv:doc]
4779
changedir = doc
4880
deps =

0 commit comments

Comments
 (0)