X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=c5d6ddb9ab45ef231d106b9725aee8b7ab36cfe7;hb=f21252c924ea71af5f52cda8d819e229403301b1;hp=63865297d7d7ea1849808b4c189a1f3c34f63a5a;hpb=839725092540cbe67c5bfbd7d39f58fd0c5ac345;p=ppu.git

diff --git a/tox.ini b/tox.ini
index 6386529..c5d6ddb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 1.8
-envlist = py27,py3{4,5,6,7,8}, pypy, py{27,38}-flake8
+minversion = 3.15
+envlist = py27,py3{4,5,6,7,8,9,10},pypy,py{27,39}-flake8
 
 # Base test environment settings
 [testenv]
@@ -11,62 +11,25 @@ basepython =
     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
 
-[general]
-commands =
-    {envpython} -m pytest
-
-[testenv:py27]
-commands =
-    {[testenv]commands}
-    {[general]commands}
-
-[testenv:py34]
-commands =
-    {[testenv]commands}
-    {[general]commands}
-
-[testenv:py35]
-commands =
-    {[testenv]commands}
-    {[general]commands}
-
-[testenv:py36]
-commands =
-    {[testenv]commands}
-    {[general]commands}
-
-[testenv:py37]
-commands =
-    {[testenv]commands}
-    {[general]commands}
-
-[testenv:py38]
-commands =
-    {[testenv]commands}
-    {[general]commands}
-
-[testenv:pypy]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310,pypy}]
 commands =
     {[testenv]commands}
-    {[general]commands}
-
-[testenv:py27-flake8]
-deps =
-    flake8
-commands =
-    {[testenv]commands}
-    flake8
+    {envpython} -m pytest
 
-[testenv:py38-flake8]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-flake8]
 deps =
     flake8
+    pytest < 7.0
 commands =
     {[testenv]commands}
     flake8