From c229b785ada691bfa07ab74056b698452855e61d Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Fri, 9 Mar 2018 13:47:28 +0800 Subject: [PATCH 1/2] Display version warning only when python exists When there is no "python" command available, there's nothing to warn about. Fix #1619. --- pipenv/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipenv/core.py b/pipenv/core.py index f9405448..9c5a4c29 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -627,7 +627,7 @@ def ensure_project(three=None, python=None, validate=True, system=False, warn=Tr path_to_python = which('python') - if project.required_python_version not in (python_version(path_to_python) or ''): + if path_to_python and project.required_python_version not in (python_version(path_to_python) or ''): click.echo( '{0}: Your Pipfile requires {1} {2}, ' 'but you are using {3} ({4}).'.format( @@ -1767,7 +1767,7 @@ def do_install( except IOError: click.echo( crayons.red( - u'Unable to find requirements file at {0}.'.format(crayons.normal(requirements)) + u'Unable to find requirements file at {0}.'.format(crayons.normal(requirements)) ), err=True ) From 1ff79911a021fdf5b81f9343f414a18367e6b78b Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Fri, 9 Mar 2018 13:52:07 +0800 Subject: [PATCH 2/2] Consider py.exe when detecting wrong versions Related to #1620, I feel this is a nice addition. --- pipenv/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipenv/core.py b/pipenv/core.py index 9c5a4c29..7971b338 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -625,7 +625,7 @@ def ensure_project(three=None, python=None, validate=True, system=False, warn=Tr # Warn users if they are using the wrong version of Python. if project.required_python_version: - path_to_python = which('python') + path_to_python = which('python') or which('py') if path_to_python and project.required_python_version not in (python_version(path_to_python) or ''): click.echo(