Fix get_python_constraint_from_marker#347
Merged
abn merged 7 commits intopython-poetry:masterfrom May 9, 2022
Merged
Conversation
…e normal form (DNF) This is useful when extracting a python_constraint from a marker.
…or markers which are not in disjunctive normal form (DNF)
…r and fix for versions with ".*"
radoering
force-pushed
the
fix-get-python-constraint-from-marker
branch
from
fa94733 to
17169c6
Compare
Merged
Member
abn
requested changes
May 9, 2022
…or markers whose disjunctive normal form (DNF) contains a group without marker name "python_version" By the way, convert_markers() was simplified significantly. That was possible because markers are converted to DNF before conversion.
radoering
force-pushed
the
fix-get-python-constraint-from-marker
branch
from
a4a4abb to
1183112
Compare
|
Kudos, SonarCloud Quality Gate passed!
|
abn
approved these changes
May 9, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes
get_python_constraint_from_marker()for markers which are not in disjunctive normal form (DNF).E.g. without the fix:
(python_version < "2.7" or python_full_version >= "3.0.0") and python_full_version < "3.6.0"results in python_constraint*whereas
<2.7 || >=3.0,<3.6would be correct.By the way, increased the test coverage for
convert_markers()andget_python_constraint_from_marker().Considering the commits separately may facilitate the review.
Update:
There was another bug in
get_python_constraint_from_marker()that is fixed by the last commit.E.g. for
python_version >= "3.9" or sys_platform == "linux"the function returned>=3.9whereas*would be correct (because forlinuxall python versions are allowed).Further, relying on the marker being in DNF before conversion, allows to simplify
convert_markers()significantly.