From d00d33be7bbf49622e471b5634f675d9510ae52a Mon Sep 17 00:00:00 2001 From: Eli Boyarski Date: Fri, 15 Sep 2017 19:38:00 +0300 Subject: [PATCH] Support Miniconda's `python --version` format On Windows, Miniconda's python prints "Python 3.6.2 :: Continuum Analytics, Inc." when running `python --version` --- pipenv/utils.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index 725a7ffd..ab7f2dcd 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -27,14 +27,17 @@ def python_version(path_to_python): return None try: - TEMPLATE = 'Python {}.{}.{}' c = delegator.run([path_to_python, '--version'], block=False) assert c.return_code == 0 except Exception: return None - output = c.out.strip() or c.err.strip() - parsed = parse.parse(TEMPLATE, output).fixed + + @parse.with_pattern(r'.*') + def allow_empty(text): + return text + TEMPLATE = 'Python {}.{}.{:d}{:AllowEmpty}' + parsed = parse.parse(TEMPLATE, output, dict(AllowEmpty=allow_empty)).fixed return u"{v[0]}.{v[1]}.{v[2]}".format(v=parsed)