Merge branch 'master' into faster-completion

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:

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:

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: