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

diff --git a/project_template/tox.ini b/project_template/tox.ini
index 6208a18..2164f05 100644
--- a/project_template/tox.ini
+++ b/project_template/tox.ini
@@ -1,13 +1,12 @@
 [tox]
-minversion = 1.8
+minversion = 2.0
 toxworkdir={homedir}/.tox/{project}
-envlist = {py26,py27,py33,py34,py35,py36},{py27,py36}-flake8
+envlist = py27,py3{4,5,6},py{27,34}-flake8
 
 # Base test environment settings
 [testenv]
 basepython =
     py27: {env:TOXPYTHON:python2.7}
-    py33: {env:TOXPYTHON:python3.3}
     py34: {env:TOXPYTHON:python3.4}
     py35: {env:TOXPYTHON:python3.5}
     py36: {env:TOXPYTHON:python3.6}
@@ -16,11 +15,8 @@ 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
+platform = linux
 sitepackages = True
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
@@ -28,29 +24,35 @@ whitelist_externals =
 
 [general]
 commands =
+    {[testenv]commands}
     python -m pytest --cov={project}
 
-[testenv:py26]
+[testenv:py27]
 commands =
-    {[testenv]commands}
     {[general]commands}
 
-[testenv:py27]
+[testenv:py34]
 commands =
-    {[testenv]commands}
     {[general]commands}
 
-[testenv:py34]
+[testenv:py35]
+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