Skip to content

Commit

Permalink
Rebased PR on main.
Browse files Browse the repository at this point in the history
  • Loading branch information
matteius authored and oz123 committed Sep 4, 2022
1 parent e6efe05 commit d337d12
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions pipenv/utils/resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -704,11 +704,20 @@ def resolve_constraints(self):
if candidate:
requires_python = candidate.link.requires_python
if requires_python:
marker = marker_from_specifier(requires_python)
self.markers[result.name] = marker
result.markers = marker
if result.req:
result.req.marker = marker
try:

marker = marker_from_specifier(requires_python)
self.markers[result.name] = marker
result.markers = marker
if result.req:
result.req.marker = marker
except TypeError as e:
click.echo(
f"Error generating python marker for {candidate}. "
f"Is the specifier {requires_python} incorrectly quoted or otherwise wrong?"
f"Full error: {e}",
err=True,
)
new_tree.add(result)
self.resolved_tree = new_tree

Expand Down

0 comments on commit d337d12

Please sign in to comment.