[MERGE] forward porting fixes from saas-3

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
old mode 100755 (executable)
new mode 100644 (file)
index 1229a6c..05178fb
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -74,7 +73,7 @@ def py2exe_options():
             'options' : {
                 "py2exe": {
                     "skip_archive": 1,
-                    "optimize": 2,
+                    "optimize": 0, # keep the assert running, because the integrated tests rely on them.
                     "dist_dir": 'dist',
                     "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "docutils", "email", "encodings", "imaplib", "jinja2", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "pytz", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
                     "excludes" : ["Tkconstants","Tkinter","tcl"],
@@ -120,20 +119,26 @@ setuptools.setup(
           'docutils',
           'feedparser',
           'gdata',
+          'gevent',
+          'psycogreen',
           'Jinja2',
           'lxml', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
           'mako',
           'mock',
-          'PIL', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
+          'pillow', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
           'psutil', # windows binary code.google.com/p/psutil/downloads/list
           'psycopg2 >= 2.2',
           'pydot',
+          'pyparsing < 2',
+          'pyserial',
           'python-dateutil < 2',
           'python-ldap', # optional
           'python-openid',
           'pytz',
+          'pyusb >= 1.0.0b1',
           'pywebdav',
           'pyyaml',
+          'qrcode',
           'reportlab', # windows binary pypi.python.org/pypi/reportlab
           'simplejson',
           'unittest2',