From 519ae5f3f24c720984b27fbd4788c68c0bf4a87d Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Mon, 21 Oct 2024 20:16:09 -0400 Subject: [PATCH] solving for issue where vcs ref is getting dropped from resolver entry. --- pipenv/resolver.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pipenv/resolver.py b/pipenv/resolver.py index 2fadd802f..690c77456 100644 --- a/pipenv/resolver.py +++ b/pipenv/resolver.py @@ -272,9 +272,10 @@ def get_cleaned_dict(self): # Handle VCS entries for key in VCS_LIST: - if key in self.pipfile_dict: - self.entry_dict[key] = self.entry_dict[key] + if key in self.lockfile_dict: + self.entry_dict[key] = self.lockfile_dict[key] self.entry_dict["ref"] = self.lockfile_dict["ref"] + self.entry_dict.pop("version", None) return self.entry_dict @property @@ -297,7 +298,7 @@ def pipfile_entry(self): @property def entry(self): - return self.make_requirement(self.name, self.entry_dict) + return self.make_requirement(self.name, self.lockfile_dict) @property def normalized_name(self): @@ -562,9 +563,7 @@ def clean_results(results, resolver, project, category): lockfile = project.lockfile_content lockfile_section = get_lockfile_section_using_pipfile_category(category) reverse_deps = project.environment.reverse_dependencies() - new_results = [ - r for r in results if r["name"] not in lockfile.get(lockfile_section, {}) - ] + new_results = [] for result in results: name = result.get("name") entry_dict = result.copy()