X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=8525f74876f176826dd53c568c7b4316a74e9830;hb=d632d1c098c4422bf2a73b3c749cfdb28333c1bf;hp=a0455a903f0be91098766285f8e9abfb372e77b7;hpb=dc15d0c1c39ffb6776e87a06ae57730be8ceb088;p=ppu.git

diff --git a/tox.ini b/tox.ini
index a0455a9..8525f74 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,72 +1,25 @@
 [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]
-basepython =
-    py27: {env:TOXPYTHON:python2.7}
-    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}
-    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