Skip to content

Commit

Permalink
Fix resolution of direct url subdependencies
Browse files Browse the repository at this point in the history
- Fix resolution of direct url VCS subdependencies (e.g. top level dep
  depends on a VCS direct url subdependency) which rely on subdirectory
  resolution
- Fixes #3976

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
  • Loading branch information
techalchemy committed May 19, 2020
1 parent 9757dbf commit 5df5282
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions news/3976.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed a bug which prevented resolution of direct URL dependencies which have PEP508 style direct url VCS sub-dependencies with subdirectories.
2 changes: 2 additions & 0 deletions pipenv/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -997,6 +997,8 @@ def clean_results(self):
for req, ireq in reqs:
if (req.vcs and req.editable and not req.is_direct_url):
continue
elif req.normalized_name in self.skipped.keys():
continue
collected_hashes = self.collect_hashes(ireq)
req = req.add_hashes(collected_hashes)
if not collected_hashes and self._should_include_hash(ireq):
Expand Down

0 comments on commit 5df5282

Please sign in to comment.