X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=c5d6ddb9ab45ef231d106b9725aee8b7ab36cfe7;hb=97bd9e39b6679afc84a5ab5fc301be50f9fe118f;hp=82c31641c72f4f53882358188f4e7b8e59bc9f41;hpb=4b15fa0aa9cf0e3d2664f1ac80a42af55a823822;p=ppu.git

diff --git a/tox.ini b/tox.ini
index 82c3164..c5d6ddb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,69 +1,35 @@
 [tox]
-minversion = 1.8
-envlist = {py27,py33,py34,py35,py36},pypy,{py27,py34}-flake8
+minversion = 3.15
+envlist = py27,py3{4,5,6,7,8,9,10},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}
+    py310: {env:TOXPYTHON:python3.10}
     pypy: {env:TOXPYTHON:pypy}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
+    {envpython} -m pytest --version
 deps =
     -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}
-
-[testenv:py34]
-commands =
-    {[testenv]commands}
-    {[general]commands}
 
-[testenv:py35]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310,pypy}]
 commands =
     {[testenv]commands}
-    {[general]commands}
-
-[testenv:py36]
-commands =
-    {[testenv]commands}
-    {[general]commands}
-
-[testenv:pypy]
-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,py310}-flake8]
 deps =
     flake8
+    pytest < 7.0
 commands =
     {[testenv]commands}
     flake8