X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=c81cceefd8e7b6ded2690d5bc9abc416ee5cfb8a;hb=f9d5897eab184c02d118b555d3c3ffb2c856e5d4;hp=eda942704659654fd8ee590762fa8433ecf30f34;hpb=0e3c1d9d63524fa38fc4639f9d344c12188c4f62;p=m_librarian.git

diff --git a/tox.ini b/tox.ini
index eda9427..c81ccee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,29 +1,27 @@
 [tox]
-minversion = 1.8
-toxworkdir={homedir}/.tox/m_librarian
-envlist = {py26,py27,py34},{py27,py34}-flake8
+minversion = 2.0
+envlist = {py27,py34,py35,py36},{py27,py34}-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}
+commands =
+    {envpython} --version
+    {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
-    pytest
-    pytest-cov
-    py26: argparse
-    py26,py27: SQLObject>=2.2.1
-    py34: SQLObject>=3.0.0
-    py26,py27: m_lib>=2.0
-    py34: m_lib>=3.0
-sitepackages = True
-# Don't fail or warn on uninstalled commands
-whitelist_externals =
-    flake8
+    -rdevscripts/requirements/requirements_tests.txt
+passenv = CI TRAVIS TRAVIS_* APPVEYOR DISTUTILS_USE_SDK MSSdk INCLUDE LIB WINDIR
+platform = linux
 
 [general]
 commands =
-    python -m pytest --cov=m_librarian
-
-[testenv:py26]
-commands = {[general]commands}
+    {[testenv]commands}
+    -rm.py -f /tmp/test.sqdb
+    {envpython} -m pytest --cov=m_librarian -D sqlite:///tmp/test.sqdb
 
 [testenv:py27]
 commands = {[general]commands}
@@ -31,12 +29,47 @@ commands = {[general]commands}
 [testenv:py34]
 commands = {[general]commands}
 
+[testenv:py35]
+commands = {[general]commands}
+
+[testenv:py36]
+commands = {[general]commands}
+
+[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}
+
+# flake8
 [testenv:py27-flake8]
 deps =
     flake8
-commands = flake8
+commands =
+    {[testenv]commands}
+    flake8
 
 [testenv:py34-flake8]
 deps =
     flake8
-commands = flake8
+commands =
+    {[testenv]commands}
+    flake8