aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini10
1 files changed, 2 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index 28e06aa..f4c91dc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
[tox]
-envlist = py26, py27, pypy, py26-django1.4, py27-django1.4, pypy-django1.4, py26-djangotrunk, py27-djangotrunk, pypy-djangotrunk
+envlist = py26, py27, pypy, py26-django1.4, py27-django1.4, pypy-django1.4, py27-djangotrunk, pypy-djangotrunk
[testenv]
commands = python setup.py test
deps =
- django==1.5
+ django==1.5.1
mock
pytest
@@ -29,12 +29,6 @@ deps =
mock
pytest
-[testenv:py26-djangotrunk]
-basepython=python2.6
-deps =
- https://github.com/django/django/tarball/master
- mock
- pytest
[testenv:py27-djangotrunk]
basepython = python2.7