From 055e1b8324b09261d3e19fb31bfdd9b84db78b42 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 8 Nov 2018 08:50:33 +0000 Subject: [PATCH] [REM] packaging: remove useless code PKG-INFO is generated during the setup phase and is not needed anymore. Also this file contains outdated informations. py2exe is not used anymore to build the windows installer. closes odoo/odoo#28494 --- odoo/PKG-INFO | 18 ------- setup.py | 113 ------------------------------------------- setup/win32/Makefile | 5 -- 3 files changed, 136 deletions(-) delete mode 100644 odoo/PKG-INFO diff --git a/odoo/PKG-INFO b/odoo/PKG-INFO deleted file mode 100644 index fba4a850f51..00000000000 --- a/odoo/PKG-INFO +++ /dev/null @@ -1,18 +0,0 @@ -Metadata-Version: 1.1 -Name: OpenERP -Version: 6.0.0 -Author: OpenERP S.A. -Author-email: fp at openerp com -Maintainer: OpenERP S.A. -Maintainer-email: fp at openerp com -Home-page: http://www.openerp.com -Download-url: http://www.openerp.com/downloads.html -Summary: OpenERP is an Enterprise Resource Management written entirely in python. -License: GPL-3 -Description: OpenERP is a complete ERP and CRM. The main features are accounting (analytic - and financial), stock management, sales and purchases management, tasks - automation, marketing campaigns, help desk, POS, etc. Technical features include - a distributed server, flexible workflows, an object database, a dynamic GUI, - customizable reports, and an XML-RPC interface. -Keywords: ERP, Accounting, Stock, CRM, Enterprise, Logistics, Management, Sales, Purchases -Platform: Linux, Win32 diff --git a/setup.py b/setup.py index e5eaffd970c..b69ae3a432d 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import os -import re -from glob import glob from setuptools import find_packages, setup from os.path import join, dirname @@ -11,115 +8,6 @@ from os.path import join, dirname exec(open(join(dirname(__file__), 'odoo', 'release.py'), 'rb').read()) # Load release variables lib_name = 'odoo' - -def py2exe_datafiles(): - data_files = {} - data_files['Microsoft.VC90.CRT'] = glob('C:\Microsoft.VC90.CRT\*.*') - - for root, dirnames, filenames in os.walk('odoo'): - for filename in filenames: - if not re.match(r'.*(\.pyc|\.pyo|\~)$', filename): - data_files.setdefault(root, []).append(join(root, filename)) - - import babel - data_files['babel/localedata'] = glob(join(dirname(babel.__file__), 'localedata', '*')) - others = ['global.dat', 'numbers.py', 'support.py', 'plural.py'] - data_files['babel'] = [join(dirname(babel.__file__), f) for f in others] - others = ['frontend.py', 'mofile.py'] - data_files['babel/messages'] = [join(dirname(babel.__file__), 'messages', f) for f in others] - - import pytz - tzdir = dirname(pytz.__file__) - for root, _, filenames in os.walk(join(tzdir, 'zoneinfo')): - base = join('pytz', root[len(tzdir) + 1:]) - data_files[base] = [join(root, f) for f in filenames] - - import docutils - import passlib - import reportlab - import requests - data_mapping = ((docutils, 'docutils'), - (passlib, 'passlib'), - (reportlab, 'reportlab'), - (requests, 'requests')) - - for mod, datadir in data_mapping: - basedir = dirname(mod.__file__) - for root, _, filenames in os.walk(basedir): - base = join(datadir, root[len(basedir) + 1:]) - data_files[base] = [join(root, f) - for f in filenames - if not f.endswith(('.py', '.pyc', '.pyo'))] - - return list(data_files.items()) - - -def py2exe_options(): - if os.name == 'nt': - import py2exe - return { - 'console': [ - {'script': 'odoo-bin', 'icon_resources': [ - (1, join('setup', 'win32', 'static', 'pixmaps', 'openerp-icon.ico')) - ]}, - ], - 'options': { - 'py2exe': { - 'skip_archive': 1, - 'optimize': 0, # Keep the assert running as the integrated tests rely on them. - 'dist_dir': 'dist', - 'packages': [ - 'asynchat', 'asyncore', - 'BeautifulSoup', - 'commands', - 'dateutil', - 'decimal', - 'decorator', - 'docutils', - 'email', - 'encodings', - 'HTMLParser', - 'imaplib', - 'jinja2', - 'lxml', 'lxml._elementpath', 'lxml.builder', 'lxml.etree', 'lxml.objectify', - 'mako', - 'markupsafe', - 'mock', - 'ofxparse', - 'odoo', - 'passlib', - 'PIL', - 'poplib', - 'psutil', - 'pychart', - 'pydot', - 'pyparsing', - 'PyPDF2', - 'pytz', - 'reportlab', - 'requests', - 'select', - 'smtplib', - 'suds', - 'uuid', - 'vatnumber', - 'vobject', - 'win32service', 'win32serviceutil', - 'xlrd', - 'xlsxwriter', - 'xlwt', - 'xml', 'xml.dom', - 'yaml', - ], - 'excludes': ['Tkconstants', 'Tkinter', 'tcl'], - } - }, - 'data_files': py2exe_datafiles() - } - else: - return {} - - setup( name='odoo', version=version, @@ -176,5 +64,4 @@ setup( tests_require=[ 'mock', ], - **py2exe_options() ) diff --git a/setup/win32/Makefile b/setup/win32/Makefile index 2efa1db6f69..06d7dc9e84d 100644 --- a/setup/win32/Makefile +++ b/setup/win32/Makefile @@ -5,9 +5,6 @@ include Makefile.servicename SERVER_DIRECTORY=../.. FILES_DIRECTORY=release -LAUNCH_PY2EXE_SERVICE=/cygdrive/c/python${PYTHON_VERSION}/python.exe win32_setup.py py2exe -LAUNCH_PY2EXE=/cygdrive/c/python${PYTHON_VERSION}/python.exe setup.py py2exe - MAKENSIS_ARGUMENTS=/DVERSION=$(VERSION) /DSERVICENAME=${SERVICENAME} LAUNCH_MAKENSIS=/cygdrive/c/tools/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi @@ -27,8 +24,6 @@ server_clean: rm -rf $(SERVER_DIRECTORY)/.cyg* allinone: server_clean - #(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_PY2EXE_SERVICE)) - #(cd $(SERVER_DIRECTORY) && $(LAUNCH_PY2EXE)) (cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_MAKENSIS)) (cd $(SERVER_DIRECTORY)/setup/win32 && mkdir -p $(FILES_DIRECTORY)) (cd $(SERVER_DIRECTORY)/setup/win32 && cp openerp-*.exe $(FILES_DIRECTORY)/openerp-server-setup-$(VERSION).exe)