Skip to content

fix simplification of python_version markers to AnyMarker#838

Merged
radoering merged 1 commit intopython-poetry:mainfrom
radoering:fix-python-marker-any
Feb 16, 2025
Merged

fix simplification of python_version markers to AnyMarker#838
radoering merged 1 commit intopython-poetry:mainfrom
radoering:fix-python-marker-any

Conversation

@radoering
Copy link
Member

@radoering radoering commented Feb 16, 2025 •
edited by sourcery-ai bot
Loading

Fixes Could not parse version constraint: ==*

Resolves: python-poetry/poetry#10184

  • Added tests for changed code.
  • Updated documentation for changed code.

Summary by Sourcery

Fix the simplification of multiple overlapping python_version markers. Ensure that overlapping marker constraints are correctly merged into a MarkerUnion instead of being incorrectly simplified to an AnyMarker.

Bug Fixes:

  • Fix incorrect simplification of multiple version markers into a single AnyMarker when merging overlapping constraints. This addresses the issue where version constraints such as python_version <= "3.6" or python_version >= "3.7" were incorrectly simplified to AnyMarker instead of remaining separate. This resolves parsing errors when evaluating overlapping constraints that should result in a MarkerUnion rather than an AnyMarker

Tests:

  • Add tests to verify the correct merging behavior of overlapping version markers, ensuring that they are combined into a MarkerUnion when appropriate.

@radoering
fix simplification of python_version markers to AnyMarker
1fa95cd 
Fixes "Could not parse version constraint: ==*"
@sourcery-ai
Copy link

sourcery-ai bot commented Feb 16, 2025 •
edited
Loading

Reviewer's Guide by Sourcery

This pull request fixes an issue where combining certain python_version markers would not correctly simplify to AnyMarker when the resulting version constraints covered all possible versions. The fix involves modifying the logic to properly identify 'any' constraints and adding a new test case to verify the correct behavior.

Updated class diagram for marker simplification

classDiagram
    class Marker
    class SingleMarker
    class AnyMarker
    class MarkerUnion
    class VersionUnion

    Marker <|-- SingleMarker
    Marker <|-- AnyMarker
    Marker <|-- MarkerUnion

    class _merge_single_markers {
        + _merge_single_markers(marker1: Marker, marker2: Marker, merge_class: type) : Marker
    }

    note for _merge_single_markers "Modified to correctly simplify python_version markers to AnyMarker when the resulting version constraints cover all possible versions."
Loading

File-Level Changes

Change Details Files
Correctly simplifies combined python_version markers to AnyMarker when the version constraints cover all possible versions.
  • Modified the logic to check if the combined python_version constraints result in an 'any' constraint.
  • If the combined constraint is 'any', the resulting marker is set to AnyMarker.
 src/poetry/core/version/markers.py
Added a test case to verify that combining incompatible python_version markers results in an AnyMarker.
  • Added a new test case with python_version <= "3.6" and python_version >= "3.7" that asserts the resulting marker is an empty string, representing AnyMarker.
 tests/version/test_markers.py
Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

sourcery-ai[bot]
sourcery-ai bot reviewed Feb 16, 2025
View reviewed changes
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @radoering - I've reviewed your changes - here's some feedback:

Overall Comments:

  • It might be helpful to add a comment explaining why result_constraint.is_any() implies that the result marker should be AnyMarker().
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good
Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@radoering radoering requested a review from a team February 16, 2025 13:46
@radoering radoering merged commit a225083 into python-poetry:main Feb 16, 2025
18 checks passed
This was referenced Feb 16, 2025
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sourcery-ai sourcery-ai[bot] sourcery-ai[bot] left review comments

@Secrus Secrus Secrus approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Poetry 2.1.0 Regression: Could not parse version constraint: ==*

2 participants

@radoering @Secrus