Fix tox serve command (#1463)

* Fix tox serve command * Fix tests fail on travis
modoboa · Apr 12, 2018 · 3b4cf12 · 3b4cf12
1 parent c095f11
commit 3b4cf12
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ DEV
 .ropeproject
 modoboa.iml
 .tox
+.eggs/
 modoboa_test
 .coverage
 build/

diff --git a/.travis.yml b/.travis.yml
@@ -36,6 +36,8 @@ install:
   - pip install -r requirements.txt
   - pip install -r ldap-requirements.txt
   - pip install -r test-requirements.txt
+  - if [ $DB = POSTGRESQL ]; then pip install -r postgresql-requirements.txt ; fi
+  - if [ $DB = MYSQL ]; then pip install -r mysql-requirements.txt ; fi
   - python setup.py develop
 
 before_script:

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -3,5 +3,3 @@ mock==2.0.0; python_version < '3.3'
 httmock==1.2.5
 testfixtures==4.7.0
 tox
-psycopg2-binary>=2.7.4
-mysqlclient>=1.3.3
diff --git a/tox.ini b/tox.ini
@@ -9,8 +9,11 @@ commands =
 
     coverage report --show-missing
 deps =
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
     coverage
+    postgres: -r{toxinidir}/postgresql-requirements.txt
+    mysql: -r{toxinidir}/mysql-requirements.txt
 setenv =
     COVERAGE_FILE={envdir}/.coverage
     DB=SQLITE