X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=afd438dcdb70dbb6163d596d2a094ed8c87e0acc;hb=4a5ceda457579e5c2ce388c38d54fa53769b2c5b;hp=596e198a334d9e14660cb5c8525c3b5d31bb34a4;hpb=ca761eabe858ca36bc5a6db14580aa6c026d94c8;p=m_librarian.git

diff --git a/tox.ini b/tox.ini
index 596e198..afd438d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,29 +1,17 @@
 [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 =
-    flake8
-    py.test
 
 [general]
 commands =
-    python /usr/local/bin/py.test --cov={envsitepackagesdir}/m_librarian
-
-[testenv:py26]
-commands = {[general]commands}
+    python -m pytest --cov=m_librarian
 
 [testenv:py27]
 commands = {[general]commands}
@@ -31,12 +19,18 @@ 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