X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=b3f3b85458fed588c554554f21348fe8b714d7f4;hb=f898f38452ed6beac2f7f5cd401d375f7098a094;hp=a69b545b4b9947583d377071ec8a119a83a4d5e6;hpb=5ff3d7feb2e7405d407fde480a6573d0c5c2b9db;p=ppu.git

diff --git a/tox.ini b/tox.ini
index a69b545..b3f3b85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,40 +1,63 @@
 [tox]
 minversion = 1.8
-toxworkdir={homedir}/.tox/remove-old-files
-envlist = {py26,py27,py34},{py27,py34}-flake8
+envlist = {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}
+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
-sitepackages = True
+    -rdevscripts/requirements/requirements_tests.txt
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     flake8
 
 [general]
 commands =
-    python -m pytest --cov=remove-old-files
-
-[testenv:py26]
-commands = {[general]commands}
+    {envpython} -m pytest
 
 [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