X-Git-Url: https://git.phdru.name/?p=cookiecutter.git;a=blobdiff_plain;f=project_template%2Ftox.ini;h=813f34a18b795bd7cb67bd1ed9740904fa11ef2c;hp=39baacdfeb78fd490a8fa8fd159bf1a8960290c4;hb=f9cb66b0a070eec5151adb1edc59634add7630d1;hpb=77a81b6bc40d9349b5236e59bf261a67482e5fa0

diff --git a/project_template/tox.ini b/project_template/tox.ini
index 39baacd..813f34a 100644
--- a/project_template/tox.ini
+++ b/project_template/tox.ini
@@ -1,40 +1,75 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py34},{py27,py34}-flake8
+toxworkdir={homedir}/.tox/{project}
+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
+    py2{6,7},pypy: m_lib>=2.0
+    py3{3,4,5,6}: m_lib>=3.0
 sitepackages = True
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     flake8
-    py.test
 
 [general]
 commands =
-    python /usr/local/bin/py.test --cov={envsitepackagesdir}/{project}
+    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 {project} scripts tests
+commands =
+    {[testenv]commands}
+    flake8
 
 [testenv:py34-flake8]
 deps =
     flake8
-commands = flake8 {project} scripts tests
+commands =
+    {[testenv]commands}
+    flake8