account.analytic.line: fix on_change_unit_amount()

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 9bb569e..d4fefa4 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,6 @@ required_modules = [
     ('pydot', 'pydot module'),
     ('pytz', 'Timezone handling library for Python'),
     ('reportlab', 'reportlab module'),
-    ('yaml', 'YAML parser and emitter for Python'),
 ]
 
 def check_modules():
@@ -77,7 +76,7 @@ def check_modules():
 
 def find_addons():
     for root, _, names in os.walk(join('bin', 'addons')):
-        if '__openerp__.py' in names or '__terp__.py' in names:
+        if '__terp__.py' in names:
             yield basename(root), root
     #look for extra modules
     try:
@@ -86,12 +85,7 @@ def find_addons():
             mname = mname.strip()
             if not mname:
                 continue
-
-            terp = join(empath, mname, '__openerp__.py')
-            if not os.path.exists(terp):
-                terp = join(empath, mname, '__terp__.py')
-
-            if os.path.exists(terp):
+            if os.path.exists(join(empath, mname, '__terp__.py')):
                 yield mname, join(empath, mname)
             else:
                 print "Module %s specified, but no valid path." % mname
@@ -176,14 +170,11 @@ options = {
         "compressed": 1,
         "optimize": 2,
         "dist_dir": 'dist',
-        "packages": [
-                 "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
-                 "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath",
-                 "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
-                 "pydot", "asyncore","asynchat", "reportlab", "vobject",
-                 "HTMLParser", "select", "mako", "poplib",
-                 "imaplib", "smtplib", "email", "yaml",
-                 ],
+        "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
+                     "lxml.objectify", "decimal", "xml", "encodings",
+                     "dateutil", "wizard", "pychart", "PIL", "pyparsing",
+                     "pydot", "asyncore","asynchat", "reportlab", "vobject",
+                     "HTMLParser", "select"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
 }