From 37f65bc8bf0145881cc5b2bdf8cf87d6d4532931 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Wed, 6 Jul 2011 15:21:49 +0530 Subject: [IMP] include vatnumber in package list as the base_vat module will use this package for vat validation bzr revid: psi@tinyerp.co.in-20110706095149-waba2fbq4imy9825 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 930b266e66b..044a5888c61 100755 --- a/setup.py +++ b/setup.py @@ -89,7 +89,7 @@ if os.name == 'nt': "pydot", "asyncore","asynchat", "reportlab", "vobject", "HTMLParser", "select", "mako", "poplib", "imaplib", "smtplib", "email", "yaml", "DAV", - "uuid", "commands", "openerp", + "uuid", "commands", "openerp", "vatnumber" ], "excludes" : ["Tkconstants","Tkinter","tcl"], } @@ -164,6 +164,7 @@ setup(name = name, 'pyyaml', 'pywebdav', 'feedparser', + 'vatnumber', ], extras_require = { 'SSL' : ['pyopenssl'], -- cgit v1.2.3 From 25237f7178894da666b53d52cd5d47f33523d458 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 9 Sep 2011 16:13:17 +0200 Subject: [IMP] move webrelease into addons/web bzr revid: al@openerp.com-20110909141317-uvo90sxlg8o5w9dx --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index cbbd4697687..45be08ff42b 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import re import sys from setuptools import setup -execfile('webrelease.py') +execfile('addons/web/common/release.py') version_dash_incompatible = False if 'bdist_rpm' in sys.argv: -- cgit v1.2.3 From e98be6cbae2af8d12f547d19e6999da10f6821b9 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 13 Sep 2011 09:12:05 +0200 Subject: [FIX] version specifier for werkzeug in setup.py file bzr revid: xmo@openerp.com-20110913071205-kak4ylecmtpviw0x --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 45be08ff42b..36db48c45da 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ setup( "simplejson >= 2.0.9", "python-dateutil >= 1.4.1", "pytz", - "werkzeug = 0.7", + "werkzeug == 0.7", ], tests_require=[ 'unittest2', -- cgit v1.2.3 From e3fb2ccea19a13284104445191f0f274976f065e Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 25 Sep 2011 14:28:22 +0200 Subject: [IMP] setup.py remove python2.5 compatibility bzr revid: al@openerp.com-20110925122822-njsjvs8d0qlwf4l5 --- setup.py | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 58424dbad12..94c3cf50a92 100755 --- a/setup.py +++ b/setup.py @@ -20,55 +20,13 @@ # ############################################################################## -# setup from TinERP -# taken from straw http://www.nongnu.org/straw/index.html -# 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, sys import os from os.path import join, isfile 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': -- cgit v1.2.3 From d1e40a55aff988007d33fccff401e9e31caaf768 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 26 Sep 2011 02:54:44 +0200 Subject: [IMP] directory cleanups, moved historical cruft into history bzr revid: al@openerp.com-20110926005444-a7vqjb05vep7xbvj --- setup.py | 71 ++++++++++++++++++++++++---------------------------------------- 1 file changed, 27 insertions(+), 44 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 94c3cf50a92..9595c1a9257 100755 --- a/setup.py +++ b/setup.py @@ -20,15 +20,12 @@ # ############################################################################## -import os, sys -import os +import glob, os, re, setuptools, sys from os.path import join, isfile -import glob -from setuptools import setup, find_packages +execfile(join('openerp', 'release.py')) py2exe_keywords = {} -py2exe_data_files = [] if os.name == 'nt': import py2exe py2exe_keywords['console'] = [ @@ -52,37 +49,30 @@ if os.name == 'nt': "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'),])) - - # copy pytz/timzeone - # TODO check if we have to also copy dateutil's timezone data. - import pytz - # Make sure the layout of pytz hasn't changed - assert (pytz.__file__.endswith('__init__.pyc') or - pytz.__file__.endswith('__init__.py')), pytz.__file__ - pytz_dir = os.path.dirname(pytz.__file__) - saved_dir = os.getcwd() - os.chdir(pytz_dir) - for dp, dn, names in os.walk('zoneinfo'): - files.append((join('pytz',dp), map(lambda x: join(pytz_dir, dp, x), names))) - os.chdir(saved_dir) +# 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 - return files - py2exe_data_files = data_files() +def gen_manifest(): + file_list="\n".join(data()) + open('MANIFEST','w').write(file_list) -execfile(join('openerp', 'release.py')) - -setup(name = name, +setuptools.setup( + name = name, version = version, description = description, long_description = long_desc, @@ -91,18 +81,10 @@ setup(name = name, author_email = author_email, classifiers = filter(None, classifiers.split("\n")), license = license, - data_files = [ - (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'], - packages = find_packages(), - include_package_data = True, - package_data = { - '': ['*.yml', '*.xml', '*.po', '*.pot', '*.csv'], - }, - dependency_links = ['http://download.gna.org/pychart/'], + data_files = data(), + packages = setuptools.find_packages(), + #include_package_data = True, install_requires = [ # We require the same version as caldav for lxml. 'lxml==2.1.5', @@ -114,6 +96,7 @@ setup(name = name, # 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/ 'pychart', 'pydot', 'pytz', -- cgit v1.2.3 From cd972ba503b149b23091de67040be1dea9a98021 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 15:32:51 +0200 Subject: [IMP] packagin setup.py dont rely on cwd bzr revid: al@openerp.com-20111001133251-tlad32kl2c1rjib9 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9595c1a9257..4813c213b91 100755 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ import glob, os, re, setuptools, sys from os.path import join, isfile -execfile(join('openerp', 'release.py')) +execfile(join(os.path.dirname(__file__), 'openerp', 'release.py')) py2exe_keywords = {} if os.name == 'nt': -- cgit v1.2.3 From dbb99ced9b346e8e2b7a1d8f04c4cb22b51147e8 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 15:42:22 +0200 Subject: [IMP] packaging rename into openerp bzr revid: al@openerp.com-20111001134222-0vjbvasuo5kvy255 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4813c213b91..9e075db314c 100755 --- a/setup.py +++ b/setup.py @@ -72,7 +72,7 @@ def gen_manifest(): open('MANIFEST','w').write(file_list) setuptools.setup( - name = name, + name = 'openerp', version = version, description = description, long_description = long_desc, -- cgit v1.2.3 From 78ddee02bf6784268bea57996fdcdfccbcab1d10 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 15:57:13 +0200 Subject: [IMP] packaging timestamp support bzr revid: al@openerp.com-20111001135713-85akuaixth6ep1fz --- setup.py | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9e075db314c..482284e7c5a 100755 --- a/setup.py +++ b/setup.py @@ -23,33 +23,6 @@ import glob, os, re, setuptools, sys from os.path import join, isfile -execfile(join(os.path.dirname(__file__), 'openerp', 'release.py')) - -py2exe_keywords = {} -if os.name == 'nt': - import py2exe - py2exe_keywords['console'] = [ - { "script": "openerp-server", - "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], - }] - py2exe_keywords['options'] = { - "py2exe": { - "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", "pychart", "PIL", "pyparsing", - "pydot", "asyncore","asynchat", "reportlab", "vobject", - "HTMLParser", "select", "mako", "poplib", - "imaplib", "smtplib", "email", "yaml", "DAV", - "uuid", "commands", "openerp", "simplejson", "vatnumber" - ], - "excludes" : ["Tkconstants","Tkinter","tcl"], - } - } - # List all data files def data(): files = [] @@ -71,6 +44,28 @@ def gen_manifest(): file_list="\n".join(data()) open('MANIFEST','w').write(file_list) +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 {} + +execfile(join(os.path.dirname(__file__), 'openerp', 'release.py')) +if timestamp: + version = version + "-" + timestamp + setuptools.setup( name = 'openerp', version = version, @@ -111,6 +106,6 @@ setuptools.setup( extras_require = { 'SSL' : ['pyopenssl'], }, - **py2exe_keywords + **py2exe_options() ) -- cgit v1.2.3 From 47014a4980b733985de2e83eec4a9ae2f496f1a5 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 18:49:14 +0200 Subject: [IMP] packaging depends bzr revid: al@openerp.com-20111001164914-34dwbgb94beshlls --- setup.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 482284e7c5a..4d5b742d4cb 100755 --- a/setup.py +++ b/setup.py @@ -81,27 +81,26 @@ setuptools.setup( packages = setuptools.find_packages(), #include_package_data = True, install_requires = [ - # We require the same version as caldav for lxml. - 'lxml==2.1.5', - 'mako', - 'python-dateutil', - 'psycopg2', # 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/ - 'pychart', + # our tree.) http://download.gna.org/pychart/ + # TODO 'pychart', + 'caldav', + 'feedparser', + 'lxml', + 'mako', + 'psycopg2', 'pydot', + 'python-dateutil', 'pytz', - 'reportlab', - 'caldav', - 'pyyaml', 'pywebdav', - 'feedparser', - 'simplejson >= 2.0', - 'vatnumber', # required by base_vat module + 'pyyaml', + 'reportlab', + 'simplejson', + 'vatnumber', # recommended by base_vat + 'werkzeug', ], extras_require = { 'SSL' : ['pyopenssl'], -- cgit v1.2.3 From 2852da3f349736878b7fb6806094061f755f7a5a Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 19:01:47 +0200 Subject: [IMP] packaging depends bzr revid: al@openerp.com-20111001170147-tz9wattxbdqwicl5 --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4d5b742d4cb..b42c99795b6 100755 --- a/setup.py +++ b/setup.py @@ -87,7 +87,6 @@ setuptools.setup( # (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', - 'caldav', 'feedparser', 'lxml', 'mako', -- cgit v1.2.3 From 7690714df3dcab3b73415375a598c60d129ab177 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 20:26:30 +0200 Subject: [FIX] missing deps babel and openid bzr revid: al@openerp.com-20111001182630-g0p3l1bjrl7js9bg --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b42c99795b6..df062502785 100755 --- a/setup.py +++ b/setup.py @@ -87,9 +87,11 @@ setuptools.setup( # (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', 'lxml', 'mako', + 'openid', 'psycopg2', 'pydot', 'python-dateutil', -- cgit v1.2.3 From a0822d02cbc2e16ad4569d78cc15a2416312dd72 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 20:29:37 +0200 Subject: [FIX] missing deps typo openid bzr revid: al@openerp.com-20111001182937-szfqkjaki3qf2y6g --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index df062502785..f4e6ddec987 100755 --- a/setup.py +++ b/setup.py @@ -91,10 +91,10 @@ setuptools.setup( 'feedparser', 'lxml', 'mako', - 'openid', 'psycopg2', 'pydot', 'python-dateutil', + 'python-openid', 'pytz', 'pywebdav', 'pyyaml', -- cgit v1.2.3 From 372943bd1b0b8b1ad0a8b6324c16a482e5f15120 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 20:34:24 +0200 Subject: [FIX] missing deps python-ldap bzr revid: al@openerp.com-20111001183424-ogc61cztbpqyn1b4 --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f4e6ddec987..b4039e0bdbd 100755 --- a/setup.py +++ b/setup.py @@ -94,6 +94,7 @@ setuptools.setup( 'psycopg2', 'pydot', 'python-dateutil', + 'python-ldap' 'python-openid', 'pytz', 'pywebdav', -- cgit v1.2.3 From ddc61228052d52338b1e9fbc5b0d67cdca46e2b5 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 20:37:21 +0200 Subject: [FIX] missing deps typo bzr revid: al@openerp.com-20111001183721-3l3c5h1ybbzg2urq --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b4039e0bdbd..caca2f09889 100755 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ setuptools.setup( 'psycopg2', 'pydot', 'python-dateutil', - 'python-ldap' + 'python-ldap', 'python-openid', 'pytz', 'pywebdav', -- cgit v1.2.3 From f80f45c0beb6a1f748cfca8c35e54df76da34bfa Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 20:44:21 +0200 Subject: missing deps gdata bzr revid: al@openerp.com-20111001184421-q1lpdwn8jph9705h --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index caca2f09889..72625af9811 100755 --- a/setup.py +++ b/setup.py @@ -89,6 +89,7 @@ setuptools.setup( # TODO 'pychart', 'babel', 'feedparser', + 'gdata', 'lxml', 'mako', 'psycopg2', -- cgit v1.2.3 From 8a28b0828c27bcefe20170f5a732cb564ca229aa Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 20:57:36 +0200 Subject: missing deps zsi bzr revid: al@openerp.com-20111001185736-ttwjp6fmoxcm1syd --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 72625af9811..d52bf951820 100755 --- a/setup.py +++ b/setup.py @@ -104,6 +104,7 @@ setuptools.setup( 'simplejson', 'vatnumber', # recommended by base_vat 'werkzeug', + 'zsi', ], extras_require = { 'SSL' : ['pyopenssl'], -- cgit v1.2.3 From 7c151653f9dde20274013d21f28d9d5412fdfcf7 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 1 Oct 2011 21:05:08 +0200 Subject: missing deps vobject bzr revid: al@openerp.com-20111001190508-d276u05j4o1ye0h3 --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d52bf951820..08c30faf737 100755 --- a/setup.py +++ b/setup.py @@ -103,6 +103,7 @@ setuptools.setup( 'reportlab', 'simplejson', 'vatnumber', # recommended by base_vat + 'vobject', 'werkzeug', 'zsi', ], -- cgit v1.2.3