[MERGE] Merge from openerp-web.

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 21c8327..36db48c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -4,16 +4,7 @@ import re
 import sys
 from setuptools import setup
 
-name = 'openerp-web-proto'
-version = '6.0.1'
-description = "Web Client of OpenERP, the Enterprise Management Software"
-long_description = "OpenERP Web is the web client of the OpenERP, a free enterprise management software"
-author = "OpenERP S.A."
-author_email = "info@openerp.com"
-support_email = 'support@openerp.com'
-url = "http://www.openerp.com/"
-download_url = ''
-license = "OEPL"
+execfile('addons/web/common/release.py')
 
 version_dash_incompatible = False
 if 'bdist_rpm' in sys.argv:
@@ -54,40 +45,35 @@ setup(
     download_url=download_url,
     license=license,
     install_requires=[
-        "CherryPy >= 3.1.2",
-        "Mako >= 0.2.4",
-        "Babel >= 0.9.4",
-        "FormEncode >= 1.2.2",
+        "Babel >= 0.9.6",
         "simplejson >= 2.0.9",
         "python-dateutil >= 1.4.1",
-        "pytz >= 2009j"
+        "pytz",
+        "werkzeug == 0.7",
     ],
+    tests_require=[
+        'unittest2',
+        'mock',
+    ],
+    test_suite = 'unittest2.collector',
     zip_safe=False,
     packages=[
-        'openobject',
-        'openobject.admin',
-        'openobject.admin.i18n',
-        'openobject.controllers',
-        'openobject.i18n',
-        'openobject.test',
-        'openobject.tools',
-        'openobject.widgets'
+        'addons',
+        'addons.base',
+        'addons.base.controllers',
+        'addons.base_calendar',
+        'addons.base_hello',
+        'openerpweb',
     ],
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 6 - Production/Stable',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Environment :: Web Environment',
         'Topic :: Office/Business :: Financial',
         ],
     scripts=['scripts/openerp-web'],
-    data_files=(find_data_files('addons/openerp')
-              + find_data_files('addons/view_calendar')
-              + find_data_files('addons/view_diagram')
-              + find_data_files('addons/view_graph')
-              + find_data_files('addons/widget_ckeditor')
-              + find_data_files('doc', patterns='')
-              + find_data_files('openobject', patterns=r'.+\.(cfg|css|js|mako|gif|png|jpg|ico)')
+    data_files=(find_data_files('addons')
               + opts.pop('data_files', [])
     ),
     **opts