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

Fix resolving against multiple markers

Browse Source 
- Fix for when requirements are also present
- Fixes #1791
This commit is contained in:
Dan Ryan
2018-03-19 17:03:42 -04:00
parent b9894ced7e
commit 240107b5cf
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/patched/piptools/resolver.py
+4 -1
View File
@@ -310,7 +310,9 @@ class Resolver(object):
for dependency_string in dependency_strings:
try:
individual_dependencies = [dep.strip() for dep in dependency_string.split(', ')]
split_deps = dependency_string.split(';')
dependencies, markers = split_deps[0], '; '.join(list(set([marker.strip() for marker in split_deps[1:]])))
individual_dependencies = [dep.strip() for dep in dependencies.split(', ')]
cleaned_deps = []
for dep in individual_dependencies:
tokens = [token.strip() for token in dep.split(';')]
@@ -325,6 +327,7 @@ class Resolver(object):
cleaned_tokens.extend(markers)
cleaned_deps.append('; '.join(cleaned_tokens))
_dependency_string = ', '.join(set(cleaned_deps))
_dependency_string += '; {0}'.format(markers)
yield InstallRequirement.from_line(_dependency_string, constraint=ireq.constraint)
except InvalidMarker: