X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=dd7f4db901bc2ca7ff6b03a03c5b3b0c4ef3e8eb;hb=6afe64542cb3afc2cacbabc56fa1b2e9eddcbca2;hp=ddd3c3a121db4ab4e7e93969bea29c6d58a11f9e;hpb=6714c899a8a8bd5b2c1c707fa1ed22b265e1e1d7;p=m_librarian.git

diff --git a/tox.ini b/tox.ini
index ddd3c3a..dd7f4db 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,12 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py34},{py27,py34}-flake8
+toxworkdir={homedir}/.tox/m_librarian
+envlist = {py27,py34,py35,py36},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
 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
+    -rdevscripts/requirements/requirements_tests.txt
 sitepackages = True
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
@@ -21,21 +16,24 @@ whitelist_externals =
 commands =
     python -m pytest --cov=m_librarian
 
-[testenv:py26]
-commands = {[general]commands}
-
 [testenv:py27]
 commands = {[general]commands}
 
 [testenv:py34]
 commands = {[general]commands}
 
+[testenv:py35]
+commands = {[general]commands}
+
+[testenv:py36]
+commands = {[general]commands}
+
 [testenv:py27-flake8]
 deps =
     flake8
-commands = flake8 m_librarian scripts test
+commands = flake8
 
 [testenv:py34-flake8]
 deps =
     flake8
-commands = flake8 m_librarian scripts test
+commands = flake8