From c6c68dd974221f77512fc2934dc2f686a4a936f2 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 7 Mar 2018 19:50:29 -0600 Subject: [PATCH 1/2] Remove unexpected keyword argument 'verbose' --- pipenv/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipenv/core.py b/pipenv/core.py index fa9d457f..8c5d911e 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -2429,7 +2429,7 @@ def do_clean( installed_package_names = [] for installed in installed_packages: - r = get_requirement(installed, verbose=verbose) + r = get_requirement(installed) # Ignore editable installations. if not r.editable: From 85ba4f2ea78747401402c8c18d070cc246bb26c1 Mon Sep 17 00:00:00 2001 From: Jeff Tratner Date: Wed, 7 Mar 2018 23:37:41 -0800 Subject: [PATCH 2/2] Really show all of stderr when verbose --- pipenv/resolver.py | 3 +++ pipenv/utils.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pipenv/resolver.py b/pipenv/resolver.py index 784e1c38..7b493f86 100644 --- a/pipenv/resolver.py +++ b/pipenv/resolver.py @@ -1,6 +1,7 @@ import os import sys import json +import logging os.environ['PIP_PYTHON_PATH'] = sys.executable @@ -24,6 +25,8 @@ if __name__ == '__main__': is_verbose = '--verbose' in sys.argv do_pre = '--pre' in sys.argv do_clear = '--clear' in sys.argv + if is_verbose: + logging.getLogger('pip').setLevel(logging.INFO) if 'PIPENV_PACKAGES' in os.environ: packages = os.environ['PIPENV_PACKAGES'].strip().split('\n') else: diff --git a/pipenv/utils.py b/pipenv/utils.py index c97494e8..2e4e258d 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -361,7 +361,9 @@ def venv_resolve_deps(deps, which, project, pre=False, verbose=False, clear=Fals except AssertionError: if verbose: click.echo(c.out, err=True) - click.echo(c.err[int(len(c.err) / 2) - 1:], err=True) + click.echo(c.err, err=True) + else: + click.echo(c.err[int(len(c.err) / 2) - 1:], err=True) sys.exit(c.return_code) if verbose: