[MRG] merge with lp:openobject-addons

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 1229a6c..7c57024 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -35,15 +35,7 @@ def data():
         r["Microsoft.VC90.CRT"] = glob.glob('C:\Microsoft.VC90.CRT\*.*')
 
         import babel
-        # Add data, but also some .py files py2exe won't include automatically.
-        # TODO This should probably go under `packages`, instead of `data`,
-        # but this will work fine (especially since we don't use the ZIP file
-        # approach).
-        r["babel/localedata"] = glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))
-        others = ['global.dat', 'numbers.py', 'support.py']
-        r["babel"] = map(lambda f: os.path.join(os.path.dirname(babel.__file__), f), others)
-        others = ['frontend.py', 'mofile.py']
-        r["babel/messages"] = map(lambda f: os.path.join(os.path.dirname(babel.__file__), "messages", f), others)
+        r["localedata"] = glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))
 
         import pytz
         tzdir = os.path.dirname(pytz.__file__)
@@ -126,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',