From 4d474b277a6580504b94d1447462488a1787c70e Mon Sep 17 00:00:00 2001 From: Michael Allan Date: Mon, 5 Mar 2018 21:17:01 +0000 Subject: [PATCH 1/2] Fix verbose flag not being retained and display output of venv_resolve_deps in verbose mode --- pipenv/core.py | 2 +- pipenv/utils.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pipenv/core.py b/pipenv/core.py index fecdef9c..ac34dd1c 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -1365,7 +1365,7 @@ def do_init( # Write out the lockfile if it doesn't exist. if not project.lockfile_exists and not skip_lock: click.echo(crayons.normal(u'Pipfile.lock not found, creating…', bold=True), err=True) - do_lock(system=system, pre=pre, keep_outdated=keep_outdated) + do_lock(system=system, pre=pre, keep_outdated=keep_outdated, verbose=verbose) do_install_dependencies(dev=dev, requirements=requirements, allow_global=allow_global, skip_lock=skip_lock, verbose=verbose, concurrent=concurrent, diff --git a/pipenv/utils.py b/pipenv/utils.py index e611a8c7..29437868 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -358,6 +358,8 @@ def venv_resolve_deps(deps, which, project, pre=False, verbose=False, clear=Fals try: assert c.return_code == 0 except AssertionError: + if verbose: + click.echo(c.out, err=True) click.echo(c.err[int(len(c.err) / 2) - 1:], err=True) sys.exit(c.return_code) From 0330f13c7097ff3a31e8b07080d6cb247bba38d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miros=C5=82aw=20Zalewski?= Date: Tue, 6 Mar 2018 11:53:34 +0100 Subject: [PATCH 2/2] Add instruction how to enable bash/zsh completion to website bash and zsh require different syntax for enabling shell completion than fish. That difference was accounted for in README, but not in docs (and, consequently, on website). --- docs/advanced.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/advanced.rst b/docs/advanced.rst index a6bd61da..13a11775 100644 --- a/docs/advanced.rst +++ b/docs/advanced.rst @@ -394,6 +394,10 @@ To enable completion in fish, add this to your config:: eval (pipenv --completion) +Alternatively, with bash or zsh, add this to your config:: + + eval "$(pipenv --completion)" + Magic shell completions are now enabled! ✨🍰✨