X-Git-Url: https://git.phdru.name/?p=cookiecutter.git;a=blobdiff_plain;f=project_template%2Ftox.ini;h=1b8aec7aab6a5e1d48453476de70197d48333983;hp=6208a18ce9f14e046f7bd37de818e261d60e76e6;hb=1be6d93333697c1969be9dbaa722299effa770f5;hpb=b2027c2ae3aa07681bd9881b9f3afc173fcd9782

diff --git a/project_template/tox.ini b/project_template/tox.ini
index 6208a18..1b8aec7 100644
--- a/project_template/tox.ini
+++ b/project_template/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.8
 toxworkdir={homedir}/.tox/{project}
-envlist = {py26,py27,py33,py34,py35,py36},{py27,py36}-flake8
+envlist = {py27,py33,py34,py35,py36},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -16,11 +16,7 @@ commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
-    pytest
-    pytest-cov
-    py26: argparse
-    py26,py27: m_lib>=2.0
-    py34: m_lib>=3.0
+    -rdevscripts/requirements/requirements_tests.txt
 sitepackages = True
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
@@ -30,12 +26,12 @@ whitelist_externals =
 commands =
     python -m pytest --cov={project}
 
-[testenv:py26]
+[testenv:py27]
 commands =
     {[testenv]commands}
     {[general]commands}
 
-[testenv:py27]
+[testenv:py33]
 commands =
     {[testenv]commands}
     {[general]commands}
@@ -45,12 +41,26 @@ commands =
     {[testenv]commands}
     {[general]commands}
 
+[testenv:py35]
+commands =
+    {[testenv]commands}
+    {[general]commands}
+
+[testenv:py36]
+commands =
+    {[testenv]commands}
+    {[general]commands}
+
 [testenv:py27-flake8]
 deps =
     flake8
-commands = flake8
+commands =
+    {[testenv]commands}
+    flake8
 
 [testenv:py34-flake8]
 deps =
     flake8
-commands = flake8
+commands =
+    {[testenv]commands}
+    flake8