kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows fix

Browse Source 
Signed-off-by: Dan Ryan <dan@danryan.co>
This commit is contained in:
Dan Ryan
2018-07-16 02:21:42 -04:00
parent 0d7afadd63
commit 08cb159e22
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/vendor/pythonfinder/models/windows.py
Vendored
+4 -12
View File
@@ -24,21 +24,13 @@ class WindowsFinder(BaseFinder):
None, filter(lambda c: version_matcher(c), self.version_list)
)
version_sort = operator.attrgetter("version_sort")
for c in sorted(py_filter, key=version_sort, reverse=True):
yield c.comes_from
return [c.comes_from for c in sorted(py_filter, key=version_sort, reverse=True)]
def find_python_version(self, major=None, minor=None, patch=None, pre=None, dev=None):
# version_matcher = operator.methodcaller(
# "matches", major=major, minor=minor, patch=patch, pre=pre, dev=dev
# )
# py_filter = filter(
# None, filter(lambda c: version_matcher(c), self.version_list)
# )
# version_sort = operator.attrgetter("version_sort")
return next(
self.find_all_python_versions(
return next((
v for v in self.find_all_python_versions(
major=major, minor=minor, patch=patch, pre=pre, dev=dev
), None
)), None
)
@versions.default
pipenv/vendor/pythonfinder/pythonfinder.py
Vendored
+3 -2
View File
@@ -71,8 +71,9 @@ class Finder(object):
def find_all_python_versions(self, major=None, minor=None, patch=None, pre=None, dev=None):
version_sort = operator.attrgetter("as_python.version_sort")
versions = self.system_path.find_all_python_versions(major=major, minor=minor, patch=patch, pre=pre, dev=dev)
versions = []
versions.extend([p for p in self.system_path.find_all_python_versions(major=major, minor=minor, patch=patch, pre=pre, dev=dev)])
if os.name == 'nt':
windows_versions = self.windows_finder.find_all_python_versions(major=major, minor=minor, patch=patch, pre=pre, dev=dev)
versions = list(versions) + list(windows_versions)
versions = versions + list(windows_versions)
return sorted(versions, key=version_sort, reverse=True)