Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added safety check in _fold_markers #5988

Merged
merged 3 commits into from
Oct 23, 2023
Merged

Added safety check in _fold_markers #5988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0975ce3
Ran across this edge case of the new release with PyJWT
matteius Oct 20, 2023
1edbcf7
Merge branch 'main' into safer-fold-markers
matteius Oct 23, 2023
ed6af7d
add news fragment
matteius Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/5988.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Additional safety check in _fold_markers logic that affected some lock resolutions in prior release.
4 changes: 3 additions & 1 deletion pipenv/utils/resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,9 @@ def _fold_markers(self, dependency_tree, install_req, checked_dependencies=None)
if install_req.name is None:
return None # Or handle this edge case differently

comes_from = dependency_tree[install_req.name]
comes_from = dependency_tree.get(install_req.name)
if comes_from is None:
return None # Or handle this edge case differently

# Check for recursion loop
if install_req.name in checked_dependencies:
Expand Down