Skip to content

Fix error reporting on Requires-Python conflicts #9552

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.

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

Merged
merged 2 commits into from
Mar 7, 2021

Conversation

uranusjr
Copy link
Member

@uranusjr uranusjr commented Feb 3, 2021

Fix #9541.

Currently, when resolution fails, the error message only shows a Requires-Python line if there is any in the graph. However, the RequiresPythonRequirement is not necessarily the actual cause to the failure.

A check is added to make sure the RequiresPythonRequirement objects are actually not satisfying, and only report a Requires-Python error if any is. Some extra logic is also added when there are more than one unsatisfying RequiresPythonRequirement objects, to show all of them instead of just the first one.

@BrownTruck
Copy link
Contributor

Hello!

I am an automated bot and I have noticed that this pull request is not currently able to be merged. If you are able to either merge the master branch into this pull request or rebase this pull request against master then it will be eligible for code review and hopefully merging!

@BrownTruck BrownTruck added the needs rebase or merge PR has conflicts with current master label Feb 20, 2021
@uranusjr uranusjr force-pushed the new-resolver-requires-python-error branch from 37ffc99 to 9858332 Compare February 22, 2021 17:08
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Feb 22, 2021
@BrownTruck
Copy link
Contributor

Hello!

I am an automated bot and I have noticed that this pull request is not currently able to be merged. If you are able to either merge the master branch into this pull request or rebase this pull request against master then it will be eligible for code review and hopefully merging!

@BrownTruck BrownTruck added the needs rebase or merge PR has conflicts with current master label Feb 25, 2021
@uranusjr uranusjr force-pushed the new-resolver-requires-python-error branch from 9858332 to d87abdf Compare February 27, 2021 23:31
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Feb 27, 2021
@uranusjr uranusjr added this to the 21.1 milestone Feb 27, 2021
@uranusjr uranusjr requested review from pradyunsg and pfmoore March 7, 2021 09:46
@uranusjr uranusjr merged commit 80e0163 into pypa:master Mar 7, 2021
@uranusjr uranusjr deleted the new-resolver-requires-python-error branch March 7, 2021 18:26
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 1, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong conflict is reported when both compatible and incompatible python_requires exist
5 participants