fix lp:876308

package 'addons/base' not exist.
I use standart method find_packages from setuptools
for fill packages setup.

lp bug: https://launchpad.net/bugs/876308 fixed

bzr revid: xavier.manach@xcg-consulting.fr-20111024141827-e7l1dtefonxe6h3n

1 files changed, 66 insertions, 106 deletions

diff --git a/setup.py b/setup.py
index 374f7308ca8..c4d16fee83e 100755..100644
--- a/setup.py
+++ b/setup.py
@@ -1,113 +1,73 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
-import glob, os, re, setuptools, sys
-from os.path import join, isfile
+import os
+import re
+import sys
+from setuptools import setup, find_packages
 
-# List all data files
-def data():
-    files = []
-    for root, dirnames, filenames in os.walk('openerp'):
-        for filename in filenames:
-            if not re.match(r'.*(\.pyc|\.pyo|\~)$',filename):
-                files.append(os.path.join(root, filename))
-    d = {}
-    for v in files:
-        k=os.path.dirname(v)
-        if k in d:
-            d[k].append(v)
-        else:
-            d[k]=[v]
-    r = d.items()
-    return r
+execfile('addons/web/common/release.py')
 
-def gen_manifest():
-    file_list="\n".join(data())
-    open('MANIFEST','w').write(file_list)
+version_dash_incompatible = False
+if 'bdist_rpm' in sys.argv:
+    version_dash_incompatible = True
+try:
+    import py2exe
+    from py2exe_utils import opts
+    version_dash_incompatible = True
+except ImportError:
+    opts = {}
+if version_dash_incompatible:
+    version = version.split('-')[0]
 
-def py2exe_options():
-    if os.name == 'nt':
-        import py2exe
-        return {
-            "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], }],
-            'options' : {
-                "py2exe": {
-                    "skip_archive": 1,
-                    "optimize": 2,
-                    "dist_dir": 'dist',
-                    "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber" "vobject", "xml", "xml", "xml.dom", "xml.xpath", "yaml", ],
-                    "excludes" : ["Tkconstants","Tkinter","tcl"],
-                }
-            }
-        }
-    else:
-        return {}
+FILE_PATTERNS = \
+    r'.+\.(py|cfg|po|pot|mo|txt|rst|gif|png|jpg|ico|mako|html|js|css|htc|swf)$'
+def find_data_files(source, patterns=FILE_PATTERNS):
+    file_matcher = re.compile(patterns, re.I)
+    out = []
+    for base, _, files in os.walk(source):
+        cur_files = []
+        for f in files:
+            if file_matcher.match(f):
+                cur_files.append(os.path.join(base, f))
+        if cur_files:
+            out.append(
+                (base, cur_files))
 
-execfile(join(os.path.dirname(__file__), 'openerp', 'release.py'))
+    return out
 
-setuptools.setup(
-      name             = 'openerp',
-      version          = version,
-      description      = description,
-      long_description = long_desc,
-      url              = url,
-      author           = author,
-      author_email     = author_email,
-      classifiers      = filter(None, classifiers.split("\n")),
-      license          = license,
-      scripts          = ['openerp-server'],
-      data_files       = data(),
-      packages         = setuptools.find_packages(),
-      #include_package_data = True,
-      install_requires = [
-        # TODO the pychart package we include in openerp corresponds to PyChart 1.37.
-        # It seems there is a single difference, which is a spurious print in generate_docs.py.
-        # It is probably safe to move to PyChart 1.39 (the latest one).
-        # (Let setup.py choose the latest one, and we should check we can remove pychart from
-        # our tree.) http://download.gna.org/pychart/
-        # TODO  'pychart',
-          'babel',
-          'feedparser',
-          'gdata',
-          'lxml',
-          'mako',
-          'psycopg2',
-          'pydot',
-          'python-dateutil',
-          'python-ldap',
-          'python-openid',
-          'pytz',
-          'pywebdav',
-          'pyyaml',
-          'reportlab',
-          'simplejson',
-          'vatnumber',
-          'vobject',
-          'werkzeug',
-          'zsi',
-      ],
-      extras_require = {
-          'SSL' : ['pyopenssl'],
-      },
-      **py2exe_options()
+setup(
+    name=name,
+    version=version,
+    description=description,
+    long_description=long_description,
+    author=author,
+    author_email=author_email,
+    url=url,
+    download_url=download_url,
+    license=license,
+    install_requires=[
+        "Babel >= 0.9.6",
+        "simplejson >= 2.0.9",
+        "python-dateutil >= 1.4.1",
+        "pytz",
+        "werkzeug == 0.7",
+    ],
+    tests_require=[
+        'unittest2',
+        'mock',
+    ],
+    test_suite = 'unittest2.collector',
+    zip_safe=False,
+    packages=find_packages(),
+    classifiers=[
+        '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')
+              + opts.pop('data_files', [])
+    ),
+    **opts
 )
-