X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=14917d6aadaa606fcf81eb5ecf7de699129bad8f;hb=56129159b1d5cf621e6245dbaf2f622d4cf055e7;hp=c32d7b62c74511fe2e09df892fc09464419a7f5a;hpb=dd127f84569ceebec6243a16c3bb9e4130493a6b;p=ppu.git

diff --git a/tox.ini b/tox.ini
index c32d7b6..14917d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,57 +1,52 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py33,py34,py35,py36},{py27,py34}-flake8
+envlist = py{27,34,35,36,37}, pypy, py{27,37}-flake8
 
 # Base test environment settings
 [testenv]
 basepython =
-    py26: {env:TOXPYTHON:python2.6}
     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}
+    py37: {env:TOXPYTHON:python3.7}
+    pypy: {env:TOXPYTHON:pypy}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
-    pytest
-    pytest-cov
-    py26: argparse
-# Don't fail or warn on uninstalled commands
-whitelist_externals =
-    flake8
+    -rdevscripts/requirements/requirements_tests.txt
 
 [general]
 commands =
     {envpython} -m pytest
 
-[testenv:py26]
+[testenv:py27]
 commands =
     {[testenv]commands}
     {[general]commands}
 
-[testenv:py27]
+[testenv:py34]
 commands =
     {[testenv]commands}
     {[general]commands}
 
-[testenv:py33]
+[testenv:py35]
 commands =
     {[testenv]commands}
     {[general]commands}
 
-[testenv:py34]
+[testenv:py36]
 commands =
     {[testenv]commands}
     {[general]commands}
 
-[testenv:py35]
+[testenv:py37]
 commands =
     {[testenv]commands}
     {[general]commands}
 
-[testenv:py36]
+[testenv:pypy]
 commands =
     {[testenv]commands}
     {[general]commands}
@@ -63,7 +58,7 @@ commands =
     {[testenv]commands}
     flake8
 
-[testenv:py34-flake8]
+[testenv:py37-flake8]
 deps =
     flake8
 commands =