[MERGE] merged trunk.

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index a26b74e..6550392 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -97,6 +97,7 @@ setuptools.setup(
           'gdata',
           'lxml < 3',
           'mako',
+          'psutil',
           'psycopg2',
           'pydot',
           'python-dateutil < 2',
@@ -116,6 +117,7 @@ setuptools.setup(
       extras_require = {
           'SSL' : ['pyopenssl'],
       },
+      tests_require = ['unittest2'],
       **py2exe_options()
 )