From 8cc5b5c28edb2c860933797bac1183b92a878912 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 8 Mar 2018 22:51:12 -0500 Subject: [PATCH] Fix new resolver code to uniqueify markers - Fixes #1617, #1622 --- pipenv/patched/piptools/resolver.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pipenv/patched/piptools/resolver.py b/pipenv/patched/piptools/resolver.py index d0aaa6e1..4e278018 100755 --- a/pipenv/patched/piptools/resolver.py +++ b/pipenv/patched/piptools/resolver.py @@ -307,6 +307,21 @@ class Resolver(object): ', '.join(sorted(dependency_strings, key=lambda s: s.lower())) or '-')) from pip._vendor.packaging.markers import InvalidMarker for dependency_string in dependency_strings: + individual_dependencies = [dep.strip() for dep in dependency_string.split(', ')] + cleaned_deps = [] + for dep in individual_dependencies: + tokens = [token.strip() for token in dep.split(';')] + cleaned_tokens = [] + markers = [] + if len(tokens) == 1: + cleaned_deps.append(tokens[0]) + continue + markers = list(set(tokens[1:])) + cleaned_tokens.append(tokens[0]) + if markers: + cleaned_tokens.extend(markers) + cleaned_deps.append('; '.join(cleaned_tokens)) + dependency_string = ', '.join(set(cleaned_deps)) yield InstallRequirement.from_line(dependency_string, constraint=ireq.constraint)