Merge remote-tracking branch 'odoo/7.0' into 7.0

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
old mode 100755 (executable)
new mode 100644 (file)
index 1229a6c..9dc814d
--- 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"],
@@ -132,7 +131,7 @@ setuptools.setup(
           'python-ldap', # optional
           'python-openid',
           'pytz',
-          'pywebdav',
+          'pywebdav < 0.9.8',
           'pyyaml',
           'reportlab', # windows binary pypi.python.org/pypi/reportlab
           'simplejson',