X-Git-Url: https://git.phdru.name/?p=m_librarian.git;a=blobdiff_plain;f=tox.ini;h=dc8bab1dbdc8c452ddd93311e135826483ea0b40;hp=3440b2110989c1394060a73e81d71ca4ff6f225e;hb=HEAD;hpb=1def263e2a7adf897fdb3f191e8924d305578e22

diff --git a/tox.ini b/tox.ini
index 3440b21..aff3292 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,36 +1,25 @@
 [tox]
 minversion = 3.15
-envlist = py27-sqlite,py3{4,5,6,7,8,9}-sqlite,py{27,39}-flake8
+envlist = py27-sqlite,py3{4,5,6,7,8,9,10,11}-sqlite,py{27,37,312}-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}
-    py39: {env:TOXPYTHON:python3.9}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
+    {envpython} -m pytest --version
 deps =
-    pip < 19.2
-    setuptools < 44
     -rdevscripts/requirements/requirements_tests.txt
-passenv = CI APPVEYOR DISTUTILS_USE_SDK MSSdk INCLUDE LIB WINDIR
-setenv =
-    VIRTUALENV_PIP = 19.1.1
+passenv = CI DISTUTILS_USE_SDK MSSdk INCLUDE LIB WINDIR
 platform = linux|darwin
 
-[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-sqlite]
 commands =
     {[testenv]commands}
     -rm.py -f /tmp/test.sqdb
     {envpython} -m pytest -D sqlite:///tmp/test.sqdb
 
-[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite-w32]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-sqlite-w32]
 platform = win32
 commands =
     {[testenv]commands}
@@ -39,18 +28,10 @@ commands =
     rm.py -f {env:TEMP}/test.sqdb
 
 # flake8
-[testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-flake8]
 deps =
     flake8
+    pytest < 7.0
 commands =
     {[testenv]commands}
     flake8
-
-[gh-actions]
-python =
-    2.7: py27
-    3.5: py35
-    3.6: py36
-    3.7: py37
-    3.8: py38
-    3.9: py39