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.

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

tests: adapt tests to cosmetic changes caused by poetry-core#826 #10110

Merged
merged 1 commit into from
Jan 25, 2025

Conversation

radoering
Copy link
Member

@radoering radoering commented Jan 25, 2025

see issue title

The poetry-plugin-export failures are caused by cosmetic changes. The tests are fixed in python-poetry/poetry-plugin-export#321. We should probably merge this PR with failing downstream tests and switch from the released poetry-core version to the main branch afterwards. (I changed the CI to use the main branch of poetry-plugin-export instead the latest release.)

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

Summary by Sourcery

Tests:

  • Adapt tests to match the simplified dependency markers generated by poetry-core.

Copy link

sourcery-ai bot commented Jan 25, 2025

Reviewer's Guide by Sourcery

This pull request adapts tests to cosmetic changes caused by poetry-core#826. The changes involve updating the expected output of the tests to match the new format of the dependency markers generated by poetry-core.

No diagrams generated as the changes look simple and do not need a visual representation.

File-Level Changes

Change Details Files
Update test expectations for dependency markers.
  • The expected output for the opencv_requires variable in test_solver_duplicate_dependencies_with_overlapping_markers_complex was updated to match the new format of the dependency markers generated by poetry-core.
  • The assertion was changed from checking if the output is in a set of possible outputs to checking if the output is equal to the expected output.
tests/puzzle/test_solver.py
Update test expectations for merged package markers.
  • The expected output for the merged package markers in test_merge_override_packages_multiple_deps was updated to match the new format of the dependency markers generated by poetry-core.
tests/puzzle/test_solver_internals.py
Update poetry-core dependency to a specific commit.
  • The poetry-core dependency was updated to a specific commit on the simplify-python-marker branch of the radoering/poetry-core repository.
pyproject.toml
Update lock file and test fixtures.
  • The poetry.lock file was updated to reflect the changes in the pyproject.toml file.
  • The test fixtures were updated to reflect the changes in the poetry.lock file.
poetry.lock
tests/installation/fixtures/update-with-locked-extras.test
tests/installation/fixtures/with-multiple-updates.test

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

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:

  • Using a personal fork of poetry-core could cause maintenance issues. What's the timeline for getting these changes merged upstream into python-poetry/poetry-core?
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.

@@ -1989,71 +1989,37 @@ def test_solver_duplicate_dependencies_with_overlapping_markers_complex(
],
)
opencv_requires = {dep.to_pep_508() for dep in ops[-1].package.requires}
expectation = (
Copy link
Member Author

Choose a reason for hiding this comment

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

Notably, I removed the distinction between "concise solution" and "current solution" because we have reached a solution which is even more concise than the "concise solution".

@radoering radoering force-pushed the simplify-python-marker branch from b916a2a to d9a6b81 Compare January 25, 2025 14:38
@abn abn enabled auto-merge (rebase) January 25, 2025 15:56
@abn abn disabled auto-merge January 25, 2025 15:56
@abn abn enabled auto-merge (rebase) January 25, 2025 15:56
@abn abn merged commit 9afecf3 into python-poetry:main Jan 25, 2025
53 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants