[MRG] merge with lp:openobject-addons

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 58d23d7..7c57024 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -118,8 +118,9 @@ setuptools.setup(
           'mock',
           'PIL', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
           'psutil', # windows binary code.google.com/p/psutil/downloads/list
-          'psycopg2 >= 2.2',
+          'psycopg2',
           'pydot',
+          'pyparsing < 2',
           'python-dateutil < 2',
           'python-ldap', # optional
           'python-openid',