From 7855fad59324f3996b9d5d89721d14ba2892ab37 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 24 Feb 2011 13:18:30 +0100 Subject: [FIX] setup.py: use the new openerp module. - python setup.py build seems to work (it produces the same result as before). - the install seems not good: code and data are duplicated in both site-packages and dist-packages. (This was already true before.) - The bin/openerp-server is not good yet. bzr revid: vmt@openerp.com-20110224121830-hte18v9zzvel5zb5 --- setup.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 00667bcdf96..de2ad54eb70 100755 --- a/setup.py +++ b/setup.py @@ -42,9 +42,7 @@ if os.name == 'nt': import py2exe has_py2exe = True -sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "bin")) - -execfile(join('bin', 'release.py')) +execfile(join('openerp', 'release.py')) if 'bdist_rpm' in sys.argv: version = version.split('-')[0] @@ -85,7 +83,7 @@ if sys.version_info < (2, 6): os.walk = walk_followlinks def find_addons(): - for root, _, names in os.walk(join('bin', 'addons'), followlinks=True): + for root, _, names in os.walk(join('openerp', 'addons'), followlinks=True): if '__openerp__.py' in names or '__terp__.py' in names: yield basename(root), root #look for extra modules @@ -111,9 +109,9 @@ def data_files(): '''Build list of data files to be installed''' files = [] if os.name == 'nt': - os.chdir('bin') + os.chdir('openerp') for (dp, dn, names) in os.walk('addons'): - files.append((dp, map(lambda x: join('bin', dp, x), names))) + files.append((dp, map(lambda x: join('openerp', dp, x), names))) os.chdir('..') #for root, _, names in os.walk(join('bin','addons')): # files.append((root, [join(root, name) for name in names])) @@ -121,7 +119,7 @@ def data_files(): files.append((root, [join(root, name) for name in names])) #for root, _, names in os.walk('pixmaps'): # files.append((root, [join(root, name) for name in names])) - files.append(('.', [join('bin', 'import_xml.rng'),])) + files.append(('.', [join('openerp', 'import_xml.rng'),])) else: man_directory = join('share', 'man') files.append((join(man_directory, 'man1'), ['man/openerp-server.1'])) @@ -134,9 +132,9 @@ def data_files(): files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'), filter(isfile, glob.glob('doc/migrate/3.4.0-4.0.0/*')))) - openerp_site_packages = join(get_python_lib(prefix=''), 'openerp-server') + openerp_site_packages = join(get_python_lib(prefix=''), 'openerp') - files.append((openerp_site_packages, [join('bin', 'import_xml.rng'),])) + files.append((openerp_site_packages, [join('openerp', 'import_xml.rng'),])) if sys.version_info[0:2] == (2,5): files.append((openerp_site_packages, [ join('python25-compat','BaseHTTPServer.py'), @@ -144,7 +142,7 @@ def data_files(): join('python25-compat','SocketServer.py')])) for addonname, add_path in find_addons(): - addon_path = join(get_python_lib(prefix=''), 'openerp-server','addons', addonname) + addon_path = join(get_python_lib(prefix=''), 'openerp','addons', addonname) for root, dirs, innerfiles in os.walk(add_path): innerfiles = filter(lambda fil: os.path.splitext(fil)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles) if innerfiles: @@ -163,16 +161,16 @@ exit 1 f.close() def find_package_dirs(): - package_dirs = {'openerp-server': 'bin'} + package_dirs = {'openerp': 'openerp'} for mod, path in find_addons(): - package_dirs['openerp-server.addons.' + mod] = path + package_dirs['openerp.addons.' + mod] = path return package_dirs class openerp_server_install(install): def run(self): - # create startup script + # create startup script TODO not correct since the openerp lib was made start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n"\ - % (join(self.install_libbase, "openerp-server"), sys.executable) + % (join(self.install_libbase, "openerp"), sys.executable) # write script f = open('openerp-server', 'w') f.write(start_script) @@ -214,7 +212,7 @@ setup(name = name, }, scripts = ['openerp-server'], packages = [ - '.'.join(['openerp-server'] + package.split('.')[1:]) + '.'.join(['openerp'] + package.split('.')[1:]) for package in find_packages() ], include_package_data = True, @@ -224,7 +222,7 @@ setup(name = name, package_dir = find_package_dirs(), console = [ { - "script": join("bin", "openerp-server.py"), + "script": "openerp-server.py", "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))] } ], -- cgit v1.2.3 From 44b392ef0996b2cb077b02cfec5ff21ead7476af Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 24 Feb 2011 15:26:59 +0100 Subject: [FIX] setup.py: easy_install seems to work. - the generated bin/openerp-server.py seems to work. - I would like to remove the data_files() call as it seems redundant with MANIFEST.in. - Same for find_package_dirs(). - I have to check first how the build on windows work (as it includes different files than on unix). bzr revid: vmt@openerp.com-20110224142659-r2wbm9f8tkldgwe6 --- setup.py | 46 ++++++++-------------------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index de2ad54eb70..c9008920fa9 100755 --- a/setup.py +++ b/setup.py @@ -34,7 +34,6 @@ import glob from pprint import pprint as pp from setuptools import setup, find_packages -from setuptools.command.install import install from distutils.sysconfig import get_python_lib has_py2exe = False @@ -152,33 +151,12 @@ def data_files(): return files -f = file('openerp-server','w') -f.write("""#!/bin/sh -echo "Error: the content of this file should have been replaced during " -echo "installation\n" -exit 1 -""") -f.close() - def find_package_dirs(): package_dirs = {'openerp': 'openerp'} for mod, path in find_addons(): package_dirs['openerp.addons.' + mod] = path return package_dirs -class openerp_server_install(install): - def run(self): - # create startup script TODO not correct since the openerp lib was made - start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n"\ - % (join(self.install_libbase, "openerp"), sys.executable) - # write script - f = open('openerp-server', 'w') - f.write(start_script) - f.close() - install.run(self) - - - options = { "py2exe": { "compressed": 1, @@ -197,6 +175,10 @@ options = { } } +#import pprint +#def setup(**args): +# pprint.pprint(args) + setup(name = name, version = version, description = description, @@ -207,32 +189,20 @@ setup(name = name, classifiers = filter(None, classifiers.split("\n")), license = license, data_files = data_files(), - cmdclass = { - 'install' : openerp_server_install, - }, - scripts = ['openerp-server'], - packages = [ - '.'.join(['openerp'] + package.split('.')[1:]) - for package in find_packages() - ], + scripts = ['openerp-server.py'], + packages = find_packages(), include_package_data = True, package_data = { '': ['*.yml', '*.xml', '*.po', '*.pot', '*.csv'], }, package_dir = find_package_dirs(), - console = [ - { - "script": "openerp-server.py", - "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))] - } - ], options = options, install_requires = [ - 'lxml', + 'lxml==2.1.5', # we require the same version as caldav 'mako', 'python-dateutil', 'psycopg2', - 'pychart', + 'pychart', # if not available from pypi, an alternate site is http://home.gna.org/pychart/ 'pydot', 'pytz', 'reportlab', -- cgit v1.2.3 From 175dc967475198d681892fb0c40d42750e09f114 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 4 Mar 2011 17:09:11 +0100 Subject: [IMP] setup.py: cleaning - Removed unnecessary custom code to search/list files and addons. - Handling of some environment variable and files created specifically by debian/rule. - This case should be handled by simply copying the addons in the server (as is done) for packaging if needed. A setup.py file will probably be created for addons in the future. - The console option has been reintroduced (it is needed for py2exe) but taking care of adding it only on os=nt. - The dependency on pychart as been commented out as we already include its code. - Building (with py2exe) on windows has yet to be tested. bzr revid: vmt@openerp.com-20110304160911-4redpkh8mbn19rid --- setup.py | 188 +++++++++++++-------------------------------------------------- 1 file changed, 39 insertions(+), 149 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c9008920fa9..70c4893fac8 100755 --- a/setup.py +++ b/setup.py @@ -25,159 +25,43 @@ # taken from gnomolicious http://www.nongnu.org/gnomolicious/ # adapted by Nicolas Évrard # +# doc/migrate is not included since about 6.1-dev +# doc/tests is not included +# python25-compat/*py should be in the openerp (and imported appropriately) import sys import os -from os.path import join, isfile, basename +from os.path import join, isfile import glob -from pprint import pprint as pp - from setuptools import setup, find_packages -from distutils.sysconfig import get_python_lib -has_py2exe = False +py2exe_keywords = {} if os.name == 'nt': import py2exe - has_py2exe = True - -execfile(join('openerp', 'release.py')) - -if 'bdist_rpm' in sys.argv: - version = version.split('-')[0] - -# get python short version -py_short_version = '%s.%s' % sys.version_info[:2] - -# backports os.walk with followlinks from python 2.6 -def walk_followlinks(top, topdown=True, onerror=None, followlinks=False): - from os.path import join, isdir, islink - from os import listdir, error - - try: - names = listdir(top) - except error, err: - if onerror is not None: - onerror(err) - return - - dirs, nondirs = [], [] - for name in names: - if isdir(join(top, name)): - dirs.append(name) - else: - nondirs.append(name) - - if topdown: - yield top, dirs, nondirs - for name in dirs: - path = join(top, name) - if followlinks or not islink(path): - for x in walk_followlinks(path, topdown, onerror, followlinks): - yield x - if not topdown: - yield top, dirs, nondirs - -if sys.version_info < (2, 6): - os.walk = walk_followlinks - -def find_addons(): - for root, _, names in os.walk(join('openerp', 'addons'), followlinks=True): - if '__openerp__.py' in names or '__terp__.py' in names: - yield basename(root), root - #look for extra modules - try: - empath = os.getenv('EXTRA_MODULES_PATH', '../addons/') - for mname in open(join(empath, 'server_modules.list')): - 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): - yield mname, join(empath, mname) - else: - print "Module %s specified, but no valid path." % mname - except Exception: - pass - -def data_files(): - '''Build list of data files to be installed''' - files = [] - if os.name == 'nt': - os.chdir('openerp') - for (dp, dn, names) in os.walk('addons'): - files.append((dp, map(lambda x: join('openerp', dp, x), names))) - os.chdir('..') - #for root, _, names in os.walk(join('bin','addons')): - # files.append((root, [join(root, name) for name in names])) - for root, _, names in os.walk('doc'): - files.append((root, [join(root, name) for name in names])) - #for root, _, names in os.walk('pixmaps'): - # files.append((root, [join(root, name) for name in names])) - files.append(('.', [join('openerp', 'import_xml.rng'),])) - else: - man_directory = join('share', 'man') - files.append((join(man_directory, 'man1'), ['man/openerp-server.1'])) - files.append((join(man_directory, 'man5'), ['man/openerp_serverrc.5'])) - - doc_directory = join('share', 'doc', 'openerp-server-%s' % version) - files.append((doc_directory, filter(isfile, glob.glob('doc/*')))) - files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'), - filter(isfile, glob.glob('doc/migrate/3.3.0-3.4.0/*')))) - files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'), - filter(isfile, glob.glob('doc/migrate/3.4.0-4.0.0/*')))) - - openerp_site_packages = join(get_python_lib(prefix=''), 'openerp') - - files.append((openerp_site_packages, [join('openerp', 'import_xml.rng'),])) - - if sys.version_info[0:2] == (2,5): - files.append((openerp_site_packages, [ join('python25-compat','BaseHTTPServer.py'), - join('python25-compat','SimpleXMLRPCServer.py'), - join('python25-compat','SocketServer.py')])) - - for addonname, add_path in find_addons(): - addon_path = join(get_python_lib(prefix=''), 'openerp','addons', addonname) - for root, dirs, innerfiles in os.walk(add_path): - innerfiles = filter(lambda fil: os.path.splitext(fil)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles) - if innerfiles: - res = os.path.normpath(join(addon_path, root.replace(join(add_path), '.'))) - files.extend(((res, map(lambda fil: join(root, fil), - innerfiles)),)) - - return files - -def find_package_dirs(): - package_dirs = {'openerp': 'openerp'} - for mod, path in find_addons(): - package_dirs['openerp.addons.' + mod] = path - return package_dirs - -options = { - "py2exe": { - "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", "DAV", - "uuid", - ], - "excludes" : ["Tkconstants","Tkinter","tcl"], + py2exe_keywords['console'] = [ + { "script": join("bin", "openerp-server.py"), + "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], + }] + py2exe_keywords['options'] = { + "py2exe": { + "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", "DAV", + "uuid", + ], + "excludes" : ["Tkconstants","Tkinter","tcl"], + } } -} -#import pprint -#def setup(**args): -# pprint.pprint(args) +execfile(join('openerp', 'release.py')) setup(name = name, version = version, @@ -188,21 +72,26 @@ setup(name = name, author_email = author_email, classifiers = filter(None, classifiers.split("\n")), license = license, - data_files = data_files(), + data_files = [ + (join('man', 'man1'), ['man/openerp-server.1']), + (join('man', 'man5'), ['man/openerp_serverrc.5']), + ('doc', filter(isfile, glob.glob('doc/*'))), + ], scripts = ['openerp-server.py'], packages = find_packages(), include_package_data = True, package_data = { '': ['*.yml', '*.xml', '*.po', '*.pot', '*.csv'], }, - package_dir = find_package_dirs(), - options = options, install_requires = [ - 'lxml==2.1.5', # we require the same version as caldav + # We require the same version as caldav for lxml. + 'lxml==2.1.5', 'mako', 'python-dateutil', 'psycopg2', - 'pychart', # if not available from pypi, an alternate site is http://home.gna.org/pychart/ + # We include pychart in our tree as it is difficult to get it via pypi. + # An alternate site is http://home.gna.org/pychart/. + # 'pychart', 'pydot', 'pytz', 'reportlab', @@ -211,8 +100,9 @@ setup(name = name, 'pywebdav', 'feedparser', ], - extras_require={ + extras_require = { 'SSL' : ['pyopenssl'], - } + }, + **py2exe_keywords ) -- cgit v1.2.3 From 4db9a2533c2b8466e0ee089b36a0840c646a1e6d Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 9 Mar 2011 11:19:39 +0100 Subject: [FIX] setup.py: modification so py2exe works. - still needs some testing, sdist should be tested again. bzr revid: vmt@openerp.com-20110309101939-zo19v7gxd1bqryrb --- setup.py | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 70c4893fac8..d8d872dfde8 100755 --- a/setup.py +++ b/setup.py @@ -36,30 +36,78 @@ import glob from setuptools import setup, find_packages +# Backports os.walk with followlinks from python 2.6. +# Needed to add all addons files to data_files for Windows packaging. +def walk_followlinks(top, topdown=True, onerror=None, followlinks=False): + from os.path import join, isdir, islink + from os import listdir, error + + try: + names = listdir(top) + except error, err: + if onerror is not None: + onerror(err) + return + + dirs, nondirs = [], [] + for name in names: + if isdir(join(top, name)): + dirs.append(name) + else: + nondirs.append(name) + + if topdown: + yield top, dirs, nondirs + for name in dirs: + path = join(top, name) + if followlinks or not islink(path): + for x in walk_followlinks(path, topdown, onerror, followlinks): + yield x + if not topdown: + yield top, dirs, nondirs + +if sys.version_info < (2, 6): + os.walk = walk_followlinks + py2exe_keywords = {} +py2exe_data_files = [] if os.name == 'nt': import py2exe py2exe_keywords['console'] = [ - { "script": join("bin", "openerp-server.py"), + { "script": "openerp-server.py", "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], }] py2exe_keywords['options'] = { "py2exe": { - "compressed": 1, + "skip_archive": 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", + "encodings", "dateutil", "pychart", "PIL", "pyparsing", # Why is wizard listed here? "pydot", "asyncore","asynchat", "reportlab", "vobject", "HTMLParser", "select", "mako", "poplib", "imaplib", "smtplib", "email", "yaml", "DAV", - "uuid", + "uuid", "openerp", ], "excludes" : ["Tkconstants","Tkinter","tcl"], } } + # TODO is it still necessary now that we don't use the library.zip file? + def data_files(): + '''For Windows, we consider all the addons as data files. + It seems also that package_data below isn't honored by py2exe.''' + files = [] + os.chdir('openerp') + for (dp, dn, names) in os.walk('addons'): + files.append((join('openerp',dp), map(lambda x: join('openerp', dp, x), names))) + os.chdir('..') + files.append(('openerp', [join('openerp', 'import_xml.rng'),])) + return files + py2exe_data_files = data_files() + +#sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "openerp")) # Is it just for wizard, or something else? execfile(join('openerp', 'release.py')) @@ -76,7 +124,7 @@ setup(name = name, (join('man', 'man1'), ['man/openerp-server.1']), (join('man', 'man5'), ['man/openerp_serverrc.5']), ('doc', filter(isfile, glob.glob('doc/*'))), - ], + ] + py2exe_data_files, scripts = ['openerp-server.py'], packages = find_packages(), include_package_data = True, -- cgit v1.2.3 From 4c45313a04bb030de0a2a548866d4dcfbbec84bb Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 11 Mar 2011 12:09:05 +0100 Subject: [FIX] setup.py: py2exe, sdist, and install seem good. - added commands to the list of modules - provide an explicit dependency link for pychart (which will be used by easy_install) bzr revid: vmt@openerp.com-20110311110905-y8s85a24naq5zxdy --- setup.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d8d872dfde8..f90e52da3f3 100755 --- a/setup.py +++ b/setup.py @@ -85,11 +85,11 @@ if os.name == 'nt': "packages": [ "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath", - "encodings", "dateutil", "pychart", "PIL", "pyparsing", # Why is wizard listed here? + "encodings", "dateutil", "pychart", "PIL", "pyparsing", "pydot", "asyncore","asynchat", "reportlab", "vobject", "HTMLParser", "select", "mako", "poplib", "imaplib", "smtplib", "email", "yaml", "DAV", - "uuid", "openerp", + "uuid", "commands", "openerp", ], "excludes" : ["Tkconstants","Tkinter","tcl"], } @@ -107,8 +107,6 @@ if os.name == 'nt': return files py2exe_data_files = data_files() -#sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "openerp")) # Is it just for wizard, or something else? - execfile(join('openerp', 'release.py')) setup(name = name, @@ -131,15 +129,19 @@ setup(name = name, package_data = { '': ['*.yml', '*.xml', '*.po', '*.pot', '*.csv'], }, + dependency_links = ['http://download.gna.org/pychart/'], install_requires = [ # We require the same version as caldav for lxml. 'lxml==2.1.5', 'mako', 'python-dateutil', 'psycopg2', - # We include pychart in our tree as it is difficult to get it via pypi. - # An alternate site is http://home.gna.org/pychart/. - # 'pychart', + # 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.) + 'pychart', 'pydot', 'pytz', 'reportlab', -- cgit v1.2.3 From 7766fcca6215e7bf27bf436ee484c8beb0d0eaad Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 24 Mar 2011 10:50:12 +0100 Subject: [REF] renamed openerp-server.py to openerp-server. bzr revid: vmt@openerp.com-20110324095012-a5joofz60zrhbit5 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f90e52da3f3..76c59126e73 100755 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ py2exe_data_files = [] if os.name == 'nt': import py2exe py2exe_keywords['console'] = [ - { "script": "openerp-server.py", + { "script": "openerp-server", "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], }] py2exe_keywords['options'] = { @@ -123,7 +123,7 @@ setup(name = name, (join('man', 'man5'), ['man/openerp_serverrc.5']), ('doc', filter(isfile, glob.glob('doc/*'))), ] + py2exe_data_files, - scripts = ['openerp-server.py'], + scripts = ['openerp-server'], packages = find_packages(), include_package_data = True, package_data = { -- cgit v1.2.3