From 2d5fc151a201ddcbdbabfb1f45060b65679f67f2 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 27 Sep 2016 11:54:12 +0200 Subject: [PATCH] [REF] cli: rename odoo.py to setup_dev.py and move it under the setup package. Since the rename of the openerp directory into odoo, having a script named "odoo.py" conflicts with a package named "odoo". --- README.md | 2 +- odoo/cli/shell.py | 2 +- odoo/tools/config.py | 2 +- setup.py | 3 +-- odoo.py => setup/setup_dev.py | 0 5 files changed, 4 insertions(+), 5 deletions(-) rename odoo.py => setup/setup_dev.py (100%) diff --git a/README.md b/README.md index 90c3c86deeb37..2521793ec582b 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ from the documentation. If you are a developer you may type the following command at your terminal: - wget -O- https://raw.githubusercontent.com/odoo/odoo/9.0/odoo.py | python + wget -O- https://raw.githubusercontent.com/odoo/odoo/10.0/setup/setup_dev.py | python Then follow the developer tutorials diff --git a/odoo/cli/shell.py b/odoo/cli/shell.py index cf7b5ffbce28b..6d0b0d5bd01c9 100644 --- a/odoo/cli/shell.py +++ b/odoo/cli/shell.py @@ -46,7 +46,7 @@ def console(self, local_vars): exec sys.stdin in local_vars else: if 'env' not in local_vars: - print 'No environment set, use `odoo.py shell -d dbname` to get one.' + print 'No environment set, use `%s shell -d dbname` to get one.' % sys.argv[0] for i in sorted(local_vars): print '%s: %s' % (i, local_vars[i]) diff --git a/odoo/tools/config.py b/odoo/tools/config.py index eddc34b5b78a8..20105c775ed94 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -45,7 +45,7 @@ def _get_default_datadir(): def _deduplicate_loggers(loggers): """ Avoid saving multiple logging levels for the same loggers to a save file, that just takes space and the list can potentially grow unbounded - if for some odd reason people use :option`odoo.py --save`` all the time. + if for some odd reason people use :option`--save`` all the time. """ # dict(iterable) -> the last item of iterable for any given key wins, # which is what we want and expect. Output order should not matter as diff --git a/setup.py b/setup.py index 41175072b1c09..c226b1631e3d2 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,6 @@ def py2exe_options(): import py2exe return { 'console': [ - {'script': 'odoo.py'}, {'script': 'openerp-server', 'icon_resources': [ (1, join('setup', 'win32', 'static', 'pixmaps', 'openerp-icon.ico')) ]}, @@ -129,7 +128,7 @@ def py2exe_options(): author_email=author_email, classifiers=filter(None, classifiers.split('\n')), license=license, - scripts=['openerp-server', 'odoo.py'], + scripts=['openerp-server'], packages=find_packages(), package_dir={'%s' % lib_name: 'odoo'}, include_package_data=True, diff --git a/odoo.py b/setup/setup_dev.py similarity index 100% rename from odoo.py rename to setup/setup_dev.py