Skip to content

Commit

Permalink
Run tests for django 1.7 with tox.
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmuellegger committed Jun 13, 2014
1 parent 7f69452 commit c1d849c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 18 deletions.
2 changes: 1 addition & 1 deletion runtests.py
Expand Up @@ -26,7 +26,7 @@

# Only test south support for Django 1.6 and lower.
if django.VERSION < (1, 7):
default_test_apps = [
default_test_apps += [
'test_south_support',
]

Expand Down
40 changes: 23 additions & 17 deletions tox.ini
@@ -1,23 +1,17 @@
[tox]
envlist =
py26-1.4, py26-1.5, py26-1.6,
py27-1.4, py27-1.5, py27-1.6,
py32-1.5, py32-1.6,
py33-1.5, py33-1.6,
pypy-1.4, pypy-1.5, pypy-1.6
py26-1.5, py26-1.6, py26-master,
py27-1.5, py27-1.6, py27-master,
py32-1.5, py32-1.6, py32-master,
py33-1.5, py33-1.6, py33-master,
pypy-1.5, pypy-1.6, pypy-master

[testenv]
commands = python runtests.py
install_command = pip install {opts} {packages}
setenv =
DJANGO_SETTINGS_MODULE = test_project.settings

[testenv:py26-1.4]
basepython = python2.6
deps =
Django >=1.4, <1.4.99
-r{toxinidir}/requirements/tests.txt

[testenv:py26-1.5]
basepython = python2.6
deps =
Expand All @@ -30,10 +24,10 @@ deps =
Django >=1.6, <1.6.99
-r{toxinidir}/requirements/tests.txt

[testenv:py27-1.4]
basepython = python2.7
[testenv:py26-master]
basepython = python2.6
deps =
Django >=1.4, <1.4.99
https://github.com/django/django/archive/master.zip#egg=Django
-r{toxinidir}/requirements/tests.txt

[testenv:py27-1.5]
Expand Down Expand Up @@ -68,6 +62,12 @@ deps =
Django >=1.6, <1.6.99
-r{toxinidir}/requirements/tests.txt

[testenv:py32-master]
basepython = python3.2
deps =
https://github.com/django/django/archive/master.zip#egg=Django
-r{toxinidir}/requirements/tests.txt

[testenv:py33-1.5]
basepython = python3.3
deps =
Expand All @@ -82,10 +82,10 @@ deps =
Django >=1.6, <1.6.99
-r{toxinidir}/requirements/tests.txt

[testenv:pypy-1.4]
basepython = pypy
[testenv:py33-master]
basepython = python3.3
deps =
Django >=1.4, <1.4.99
https://github.com/django/django/archive/master.zip#egg=Django
-r{toxinidir}/requirements/tests.txt

[testenv:pypy-1.5]
Expand All @@ -99,3 +99,9 @@ basepython = pypy
deps =
Django >=1.6, <1.6.99
-r{toxinidir}/requirements/tests.txt

[testenv:pypy-master]
basepython = pypy
deps =
https://github.com/django/django/archive/master.zip#egg=Django
-r{toxinidir}/requirements/tests.txt

0 comments on commit c1d849c

Please sign in to comment.