use generative env list in tox instead

jazzband · Apr 8, 2015 · 63ab3d4 · 63ab3d4
1 parent acc7c9f
commit 63ab3d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/silk/middleware.py b/silk/middleware.py
@@ -10,7 +10,6 @@
 
 from silk.config import SilkyConfig
 from silk.model_factory import RequestModelFactory, ResponseModelFactory
-from silk.models import _time_taken
 from silk.profiling import dynamic
 from silk.profiling.profiler import silk_meta_profiler
 from silk.sql import execute_sql

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = django15, django16, django17, py27, py34
+envlist = py{27,34}-django{15,16,17}
 
 [testenv]
 commands = {toxinidir}/tests/manage.py test
@@ -8,19 +8,9 @@ setenv =
     PYTHONPATH={toxinidir}/tests
 
 deps =
+    django15: Django>=1.5,<1.6
+    django16: Django>=1.6,<1.7
+    django17: Django>=1.7,<1.8
     -r{toxinidir}/tests/test-requirements.txt
 
-[testenv:django15]
-deps =
-    django==1.5.12
-    -r{toxinidir}/tests/test-requirements.txt
 
-[testenv:django16]
-deps =
-    django==1.6.8
-    -r{toxinidir}/tests/test-requirements.txt
-
-[testenv:django17]
-deps =
-    -r{toxinidir}/tests/test-requirements.txt
-    django==1.7.7