Skip to content

Commit

Permalink
[REF] cli: rename odoo.py to setup_dev.py
Browse files Browse the repository at this point in the history
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".
  • Loading branch information
sle-odoo committed Sep 30, 2016
1 parent ea3d9e6 commit 2d5fc15
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href="https://www.odoo.com/documentation/9.0/tutorials.html">the developer tutorials</a>

Expand Down
2 changes: 1 addition & 1 deletion odoo/cli/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
2 changes: 1 addition & 1 deletion odoo/tools/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
]},
Expand Down Expand Up @@ -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,
Expand Down
File renamed without changes.

0 comments on commit 2d5fc15

Please sign in to comment.