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

diff --git a/tox.ini b/tox.ini
index 596e198..cd0f99b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
 minversion = 1.8
+toxworkdir={homedir}/.tox/m_librarian
 envlist = {py26,py27,py34},{py27,py34}-flake8
 
 # Base test environment settings
@@ -10,17 +11,15 @@ deps =
     py26: argparse
     py26,py27: SQLObject>=2.2.1
     py34: SQLObject>=3.0.0
-    py26,py27: m_lib>=2.0
-    py34: m_lib>=3.0
+    m_lib.defenc>=1.0
 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
+    python -m pytest --cov=m_librarian
 
 [testenv:py26]
 commands = {[general]commands}
@@ -34,9 +33,9 @@ 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