[FORWARD] Forward port of server 7.0 until revision 4988

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index b53c9a4..28c78a9 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -127,6 +127,7 @@ setuptools.setup(
           'psutil', # windows binary code.google.com/p/psutil/downloads/list
           'psycopg2 >= 2.2',
           'pydot',
+          'pyparsing < 2',
           'python-dateutil < 2',
           'python-ldap', # optional
           'python-openid',