X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=80945b6362b354acb2de23ab5c8abb94b0058c69;hb=e6cdf38ffda522ea238f566462ae8d357f65be14;hp=df4446418b73625f8da867d492b84d49842e1fcc;hpb=d3a80ce733d72c46984631e5d8e7f690c5a71bf0;p=m_librarian.git

diff --git a/tox.ini b/tox.ini
index df44464..80945b6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 2.0
-envlist = py27,py3{4,5,6,7,8,9},py{27,39}-flake8
+minversion = 3.15
+envlist = py27-sqlite,py3{4,5,6,7,8,9,10}-sqlite,py{27,39}-flake8
 
 # Base test environment settings
 [testenv]
@@ -12,91 +12,45 @@ basepython =
     py37: {env:TOXPYTHON:python3.7}
     py38: {env:TOXPYTHON:python3.8}
     py39: {env:TOXPYTHON:python3.9}
+    py310: {env:TOXPYTHON:python3.10}
 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
+passenv = CI DISTUTILS_USE_SDK MSSdk INCLUDE LIB WINDIR
+platform = linux|darwin
 
-[general]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-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}
-
-[testenv:py39]
-commands = {[general]commands}
-
-[sqlite-w32]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-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 =
-    {[sqlite-w32]commands}
-
-[testenv:py38-sqlite-w32]
-platform = win32
-commands =
-    {[sqlite-w32]commands}
-
-[testenv:py39-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]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-flake8]
 deps =
     flake8
+    pytest < 7.0
 commands =
     {[testenv]commands}
     flake8
 
-[testenv:py39-flake8]
-deps =
-    flake8
-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
+    3.10: py310