diff --git a/peru/main.py b/peru/main.py index a9fd0c7..403854e 100644 --- a/peru/main.py +++ b/peru/main.py @@ -316,7 +316,7 @@ def merged_args_dicts(global_args, subcommand_args): def docopt_parse_args(argv): - args = docopt.docopt(__doc__, argv, help=False, options_first=True) + args = docopt.docopt(__doc__, argv, default_help=False, options_first=True) command = args[''] # Skip further parsing for cases like `peru badcommand` (because there is # no docopt), `peru help ` (because help is a fake command also with @@ -325,7 +325,10 @@ def docopt_parse_args(argv): if command in COMMAND_DOCS and not args['--help']: command_doc = COMMAND_DOCS[command] command_argv = [command] + args[''] - command_args = docopt.docopt(command_doc, command_argv, help=False) + command_args = docopt.docopt( + command_doc, + command_argv, + default_help=False) args = merged_args_dicts(args, command_args) return args diff --git a/setup.py b/setup.py index 24307ac..661af03 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ def get_all_resources_filepaths(): def get_install_requires(): - dependencies = ['docopt', 'PyYAML'] + dependencies = ['docopt-ng', 'PyYAML'] if sys.version_info < (3, 5): raise RuntimeError('The minimum supported Python version is 3.5.') return dependencies