From 4a8eeada96f65188db383353e581bd4941ff80b2 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Mon, 21 Jan 2019 20:02:50 -0500 Subject: [PATCH] Remove pyc from pyinstaller and grab final updates from pythonfinder Signed-off-by: Dan Ryan --- pipenv/vendor/pythonfinder/pythonfinder.py | 25 +++++++++++++--------- tests/test_artifacts/git/pyinstaller | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pipenv/vendor/pythonfinder/pythonfinder.py b/pipenv/vendor/pythonfinder/pythonfinder.py index edbc149b..63f63c74 100644 --- a/pipenv/vendor/pythonfinder/pythonfinder.py +++ b/pipenv/vendor/pythonfinder/pythonfinder.py @@ -12,7 +12,7 @@ from vistir.compat import lru_cache from . import environment from .exceptions import InvalidPythonVersion from .models import path -from .utils import Iterable, filter_pythons +from .utils import Iterable, filter_pythons, version_re if environment.MYPY_RUNNING: @@ -174,14 +174,20 @@ class Finder(object): name = "%s" % major major = None else: - version_dict = { - "major": major, - "minor": minor, - "patch": patch, - "pre": pre, - "dev": dev, - "arch": arch - } + if "." in major and all(part.isdigit() for part in major.split(".")[:2]): + match = version_re.match(major) + version_dict = match.groupdict() + version_dict["is_prerelease"] = bool(version_dict.get("prerel", False)) + version_dict["is_devrelease"] = bool(version_dict.get("dev", False)) + else: + version_dict = { + "major": major, + "minor": minor, + "patch": patch, + "pre": pre, + "dev": dev, + "arch": arch + } if version_dict.get("minor") is not None: minor = int(version_dict["minor"]) if version_dict.get("patch") is not None: @@ -199,7 +205,6 @@ class Finder(object): ) if match: return match - secho("Using name: %s" % name, fg="white") return self.system_path.find_python_version( major=major, minor=minor, patch=patch, pre=pre, dev=dev, arch=arch, name=name ) diff --git a/tests/test_artifacts/git/pyinstaller b/tests/test_artifacts/git/pyinstaller index 19d8a378..7719afed 160000 --- a/tests/test_artifacts/git/pyinstaller +++ b/tests/test_artifacts/git/pyinstaller @@ -1 +1 @@ -Subproject commit 19d8a378987d6115c0acb72ef954bbf3bca3c61b +Subproject commit 7719afeda5d31d99c26e3dc6ec97132735f5791f