X-Git-Url: https://git.phdru.name/?p=m_librarian.git;a=blobdiff_plain;f=tox.ini;h=dc8bab1dbdc8c452ddd93311e135826483ea0b40;hp=cd541328032d8031adf479b084e257d3055cd282;hb=HEAD;hpb=5a068e6e04b4441e6efae55619e9b54da2d6a020

diff --git a/tox.ini b/tox.ini
index cd54132..aff3292 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,95 +1,37 @@
 [tox]
-minversion = 2.0
-envlist = py27,py3{4,5,6,7,8},py{27,38}-flake8
+minversion = 3.15
+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}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
+    {envpython} -m pytest --version
 deps =
     -rdevscripts/requirements/requirements_tests.txt
-passenv = CI TRAVIS TRAVIS_* APPVEYOR DISTUTILS_USE_SDK MSSdk INCLUDE LIB WINDIR
-platform = linux
-whitelist_externals = cmd.exe
+passenv = CI DISTUTILS_USE_SDK MSSdk INCLUDE LIB WINDIR
+platform = linux|darwin
 
-[general]
+[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 --cov=m_librarian -D sqlite:///tmp/test.sqdb
+    {envpython} -m pytest -D sqlite:///tmp/test.sqdb
 
-[testenv:py27]
-commands = {[general]commands}
-
-[testenv:py34]
-commands = {[general]commands}
-
-[testenv:py35]
-commands = {[general]commands}
-
-[testenv:py36]
-commands = {[general]commands}
-
-[testenv:py37]
-commands = {[general]commands}
-
-[testenv:py38]
-commands = {[general]commands}
-
-[sqlite-w32]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-sqlite-w32]
 platform = win32
 commands =
     {[testenv]commands}
-    -rm.py -f C:/projects/m-librarian/test.sqdb
-    pytest --cov=m_librarian -D sqlite:/C:/projects/m-librarian/test.sqdb?debug=1
-    rm.py -f C:/projects/m-librarian/test.sqdb
-
-[testenv:py27-sqlite-w32]
-platform = win32
-commands = {[sqlite-w32]commands}
-
-[testenv:py34-sqlite-w32]
-platform = win32
-commands = {[sqlite-w32]commands}
-
-[testenv:py35-sqlite-w32]
-platform = win32
-commands = {[sqlite-w32]commands}
-
-[testenv:py36-sqlite-w32]
-platform = win32
-commands = {[sqlite-w32]commands}
-
-[testenv:py37-sqlite-w32]
-platform = win32
-commands =
-    cmd /c "copy devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py"
-    {[sqlite-w32]commands}
-
-[testenv:py38-sqlite-w32]
-platform = win32
-commands =
-    {[sqlite-w32]commands}
+    -rm.py -f {env:TEMP}/test.sqdb
+    pytest -D sqlite:/{env:TEMP}/test.sqdb?debug=1
+    rm.py -f {env:TEMP}/test.sqdb
 
 # flake8
-[testenv:py27-flake8]
-deps =
-    flake8
-commands =
-    {[testenv]commands}
-    flake8
-
-[testenv:py38-flake8]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-flake8]
 deps =
     flake8
+    pytest < 7.0
 commands =
     {[testenv]commands}
     flake8