diff --git a/NEWS.rst b/NEWS.rst index f9e20d927410a20b76b412bb10002b36c4bcae93_TkVXUy5yc3Q=..00b990bfe4f3d19375b829cff66d4dc85bd80d7e_TkVXUy5yc3Q= 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,12 @@ History ======= +10.0.0 +------ + +Add option to include custom developer mode. Default is still to use reload and pdb. To use ipdb, use ``--dev-opt ipdb`` instead of ``--ipdb``. + + 9.0.1 ----- diff --git a/odoo_scripts/docker_dev_start.py b/odoo_scripts/docker_dev_start.py index f9e20d927410a20b76b412bb10002b36c4bcae93_b2Rvb19zY3JpcHRzL2RvY2tlcl9kZXZfc3RhcnQucHk=..00b990bfe4f3d19375b829cff66d4dc85bd80d7e_b2Rvb19zY3JpcHRzL2RvY2tlcl9kZXZfc3RhcnQucHk= 100755 --- a/odoo_scripts/docker_dev_start.py +++ b/odoo_scripts/docker_dev_start.py @@ -229,12 +229,6 @@ "--no-dev", help="No dev options", action="store_false", dest="dev" ) dev_option_group.add_argument( - "--ipdb", - help="Use ipdb rather than pdb", - action="store_true", - dest="ipdb", - ) - dev_option_group.add_argument( "--dev-opt", help="add extra dev options", nargs="+", @@ -327,7 +321,6 @@ run_isort = nmspc.isort odoo_help = nmspc.odoo_help dev = nmspc.dev - ipdb = nmspc.ipdb dev_opts = nmspc.dev_opts restore_filename = nmspc.DUMP database = nmspc.database @@ -797,5 +790,6 @@ if run_isort: isort() + # developer mode options if dev: if odoo_type in ("odoo10", "odoo11", "odoo13"): @@ -800,11 +794,17 @@ if dev: if odoo_type in ("odoo10", "odoo11", "odoo13"): - dev_opts.append("reload") - # pdb should not be run if not interactive - if ipdb: - dev_opts.append("ipdb") - else: + # automatically add reload if not already asks for + if not any(opt not in dev_opts for opt in ("all", "reload")): + dev_opts.append("reload") + # XXX pdb should not be run if not interactive + # add pdb if no pubd, wdb, ipdb, pdb or all + # the list of available options differs by odoo version and can be + # seen with odoo --help, available with --odoo-help + if not any( + debugger not in dev_opts + for debugger in ("pubd", "wdb", "ipdb", "pdb", "all") + ): dev_opts.append("pdb") arg.append(f"--dev={','.join(set(dev_opts))}") if odoo_type in ("odoo8",): arg.append("--auto-reload") @@ -807,7 +807,8 @@ dev_opts.append("pdb") arg.append(f"--dev={','.join(set(dev_opts))}") if odoo_type in ("odoo8",): arg.append("--auto-reload") + if odoo_help: arg.append("--help")