From b802353106813afe34c04f40c3bda41d85f06d63 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 10 Oct 2018 17:21:25 -0400 Subject: [PATCH 1/4] Fix pipfile entry formation Signed-off-by: Dan Ryan --- pipenv/utils.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index 88622b686d..4c65f3635f 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -489,9 +489,14 @@ def resolve_deps( # if verbose: # print('Error generating hash for {}'.format(name)) req.hashes = sorted(set(collected_hashes)) - name, entry = req.pipfile_entry + name, _entry = req.pipfile_entry + entry = {} + if isinstance(_entry, six.string_types): + entry["version"] = _entry + else: + entry["version"] = version + entry.update(_entry) entry["name"] = name - entry["version"] = version # if index: # d.update({"index": index}) if markers_lookup.get(result.name): From 7e2443d5b65cf491719733cba0984004fd83aa53 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 10 Oct 2018 17:36:14 -0400 Subject: [PATCH 2/4] Fix versions Signed-off-by: Dan Ryan --- pipenv/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index 4c65f3635f..f3599301da 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -492,10 +492,10 @@ def resolve_deps( name, _entry = req.pipfile_entry entry = {} if isinstance(_entry, six.string_types): - entry["version"] = _entry + entry["version"] = _entry.lstrip("=") else: - entry["version"] = version entry.update(_entry) + entry["version"] = version entry["name"] = name # if index: # d.update({"index": index}) From a82f429fe9e9669389e996b901346c6278804fba Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 10 Oct 2018 17:21:25 -0400 Subject: [PATCH 3/4] Fix pipfile entry formation Signed-off-by: Dan Ryan --- pipenv/utils.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index 88622b686d..4c65f3635f 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -489,9 +489,14 @@ def resolve_deps( # if verbose: # print('Error generating hash for {}'.format(name)) req.hashes = sorted(set(collected_hashes)) - name, entry = req.pipfile_entry + name, _entry = req.pipfile_entry + entry = {} + if isinstance(_entry, six.string_types): + entry["version"] = _entry + else: + entry["version"] = version + entry.update(_entry) entry["name"] = name - entry["version"] = version # if index: # d.update({"index": index}) if markers_lookup.get(result.name): From b34b5fd95135bd9106eab6376bdd5a13165faf45 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 10 Oct 2018 17:36:14 -0400 Subject: [PATCH 4/4] Fix versions Signed-off-by: Dan Ryan --- pipenv/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index 4c65f3635f..f3599301da 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -492,10 +492,10 @@ def resolve_deps( name, _entry = req.pipfile_entry entry = {} if isinstance(_entry, six.string_types): - entry["version"] = _entry + entry["version"] = _entry.lstrip("=") else: - entry["version"] = version entry.update(_entry) + entry["version"] = version entry["name"] = name # if index: # d.update({"index": index})