Merge branch 'master' into almet/fix-pbkdf2-check

1 files changed, 11 insertions, 2 deletions

diff --git a/tox.ini b/tox.ini
index ddef0a1..15c2b40 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,22 +6,31 @@ skip_missing_interpreters = True
 
 commands =
     python --version
-    py.test ihatemoney/tests/tests.py
+    py.test --pyargs ihatemoney.tests.tests
+
 deps =
     -rdev-requirements.txt
     -rrequirements.txt
 
-install_command = pip install --pre {opts} {packages}
+# To be sure we are importing ihatemoney pkg from pip-installed version
+changedir = /tmp
+
+install_command =
+    pip install --pre {opts} {packages}
+    pip install .
+
 
 [testenv:docs]
 commands = sphinx-build -a -n -b html -d docs/_build/doctrees docs docs/_build/html
 deps =
     -rdocs/requirements.txt
+changedir = {toxinidir}
 
 [testenv:lint]
 commands = flake8 ihatemoney
 deps =
     -rdev-requirements.txt
+changedir = {toxinidir}
 
 [flake8]
 exclude = migrations