X-Git-Url: https://git.phdru.name/?p=cookiecutter.git;a=blobdiff_plain;f=project_template%2Ftox.ini;h=c19b8ec0e2ed1588bb5595061eed1b5d22a84229;hp=fcb27013853a383415be4d940aa348513e7b05b7;hb=f2fae5feca94a4276e69051d2821b697e45b1148;hpb=85517743fc18c8105c860bfc3e105d5dd2a366b3

diff --git a/project_template/tox.ini b/project_template/tox.ini
index fcb2701..c19b8ec 100644
--- a/project_template/tox.ini
+++ b/project_template/tox.ini
@@ -1,16 +1,22 @@
 [tox]
 minversion = 1.8
 toxworkdir={homedir}/.tox/{project}
-envlist = {py26,py27,py34},{py27,py34}-flake8
+envlist = {py26,py27,py33,py34,py35,py36},{py27,py34}-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}
+    pypy: {env:TOXPYTHON:pypy}
+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 =
@@ -21,20 +27,45 @@ commands =
     python -m pytest --cov={project}
 
 [testenv:py26]
-commands = {[general]commands}
+commands =
+    {[testenv]commands}
+    {[general]commands}
 
 [testenv:py27]
-commands = {[general]commands}
+commands =
+    {[testenv]commands}
+    {[general]commands}
+
+[testenv:py33]
+commands =
+    {[testenv]commands}
+    {[general]commands}
 
 [testenv:py34]
-commands = {[general]commands}
+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