Skip to content

Commit acc21dd

Browse files
authored
Merge pull request pypa#630 from techalchemy/add_click_error_flags
Add click error flags
2 parents 514b0bc + 4596526 commit acc21dd

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

pipenv/cli.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ def activate_pyenv():
470470
''.format(
471471
crayons.red('Warning', bold=True),
472472
crayons.white('PATH', bold=True)
473-
)
473+
), err=True
474474
)
475475

476476
return path_to_python
@@ -746,7 +746,7 @@ def do_install_dependencies(
746746

747747
# We echo both c.out and c.err because pip returns error details on out.
748748
click.echo(crayons.blue(format_pip_output(c.out)))
749-
click.echo(crayons.blue(format_pip_error(c.err)))
749+
click.echo(crayons.blue(format_pip_error(c.err)), err=True)
750750

751751
# Return the subprocess' return code.
752752
sys.exit(c.return_code)
@@ -1387,7 +1387,7 @@ def cli(
13871387
'so it will automatically use that environment, instead of '
13881388
'creating its own for any project.'.format(
13891389
crayons.green('Courtesy Notice')
1390-
)
1390+
), err=True
13911391
)
13921392

13931393
if ctx.invoked_subcommand is None:
@@ -1527,8 +1527,12 @@ def install(
15271527
try:
15281528
assert c.return_code == 0
15291529
except AssertionError:
1530-
click.echo('{0} An error occurred while installing {1}!'.format(crayons.red('Error: ', bold=True), crayons.green(package_name)))
1531-
click.echo(crayons.blue(format_pip_error(c.err)))
1530+
click.echo(
1531+
'{0} An error occurred while installing {1}!'.format(
1532+
crayons.red('Error: ', bold=True),
1533+
crayons.green(package_name)
1534+
), err=True)
1535+
click.echo(crayons.blue(format_pip_error(c.err)), err=True)
15321536
sys.exit(1)
15331537

15341538
if dev:
@@ -1607,7 +1611,7 @@ def uninstall(
16071611
package_names = package_names.keys()
16081612

16091613
if package_name is False and not dev:
1610-
click.echo(crayons.red('No package provided!'))
1614+
click.echo(crayons.red('No package provided!'), err=True)
16111615
sys.exit(1)
16121616

16131617
for package_name in package_names:
@@ -1886,10 +1890,10 @@ def check(three=None, python=False):
18861890
crayons.green(marker),
18871891
crayons.blue(specifier),
18881892
crayons.red(results[marker])
1889-
)
1893+
), err=True
18901894
)
18911895
if failed:
1892-
click.echo(crayons.red('Failed!'))
1896+
click.echo(crayons.red('Failed!'), err=True)
18931897
sys.exit(1)
18941898
else:
18951899
click.echo(crayons.green('Passed!'))
@@ -1907,8 +1911,8 @@ def check(three=None, python=False):
19071911
try:
19081912
results = json.loads(c.out)
19091913
except ValueError:
1910-
click.echo('An error occured:')
1911-
click.echo(c.err)
1914+
click.echo('An error occured:', err=True)
1915+
click.echo(c.err, err=True)
19121916
sys.exit(1)
19131917

19141918
for (package, resolved, installed, description, vuln) in results:

0 commit comments

Comments
 (0)