X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=eddc5cd03f0fb8ccadb5a0cc143460837af2047b;hb=cd829915516da0db40ad4a82e90ee593053bf9ac;hp=b3f3b85458fed588c554554f21348fe8b714d7f4;hpb=6fae43596df9f454186896d861c9062646e51ee1;p=ppu.git

diff --git a/tox.ini b/tox.ini
index b3f3b85..eddc5cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,61 +1,34 @@
 [tox]
-minversion = 1.8
-envlist = {py27,py33,py34,py35,py36},{py27,py34}-flake8
+minversion = 3.15
+envlist = py27,py3{4,5,6,7,8,9},pypy,py{27,39}-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}
+    py37: {env:TOXPYTHON:python3.7}
+    py38: {env:TOXPYTHON:python3.8}
+    py39: {env:TOXPYTHON:python3.9}
+    pypy: {env:TOXPYTHON:pypy}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
+    pip < 19.2
+    setuptools < 44
     -rdevscripts/requirements/requirements_tests.txt
-# Don't fail or warn on uninstalled commands
-whitelist_externals =
-    flake8
-
-[general]
-commands =
-    {envpython} -m pytest
-
-[testenv:py27]
-commands =
-    {[testenv]commands}
-    {[general]commands}
-
-[testenv:py33]
-commands =
-    {[testenv]commands}
-    {[general]commands}
+setenv =
+    VIRTUALENV_PIP = 19.1.1
 
-[testenv:py34]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,pypy}]
 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 =
-    {[testenv]commands}
-    flake8
+    {envpython} -m pytest
 
-[testenv:py34-flake8]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8]
 deps =
     flake8
 commands =