aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini17
1 files changed, 8 insertions, 9 deletions
diff --git a/tox.ini b/tox.ini
index 76f4f09b..c986250c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
py27-{flake8,docs},
{py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16},
- {py27,py32,py33,py34}-django{17,18alpha}
+ {py27,py32,py33,py34}-django{17,18beta}
[testenv]
commands = ./runtests.py --fast
@@ -14,19 +14,18 @@ deps =
django15: Django==1.5.6 # Should track minimum supported
django16: Django==1.6.3 # Should track minimum supported
django17: Django==1.7.2 # Should track maximum supported
- django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/
- django-guardian==1.2.4
- pytest-django==2.8.0
- django-filter==0.9.2
- markdown>=2.1.0
+ django18beta: https://www.djangoproject.com/download/1.8b1/tarball/
+ -rrequirements/requirements-testing.txt
+ -rrequirements/requirements-optionals.txt
[testenv:py27-flake8]
deps =
- pytest==2.6.4
- flake8==2.2.2
+ -rrequirements/requirements-testing.txt
+ -rrequirements/requirements-codestyle.txt
commands = ./runtests.py --lintonly
[testenv:py27-docs]
deps =
- mkdocs>=0.11.1
+ -rrequirements/requirements-testing.txt
+ -rrequirements/requirements-documentation.txt
commands = mkdocs build