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

ci: Update uv.lock on release-please PRs #870

Merged
merged 1 commit into from
Mar 18, 2025
Merged

Conversation

aborgna-q
Copy link
Collaborator

uv 0.6.6 adds a hard error when the version of the package in uv.lock does not match the one declared in the editable wheel: astral-sh/uv#12235.

release-please doesn't update the lock files automatically, so release PRs needed a manual lock update.
This PR adds the lockfile as an extra-file, to avoid this manual step.

Note that the jsonpath in the config is not technically correct, as release-please's json array filters don't quite work for toml files. See googleapis/release-please#2455, which includes this hacky workaround.

@aborgna-q aborgna-q requested a review from ss2165 March 18, 2025 14:36
@aborgna-q aborgna-q requested a review from a team as a code owner March 18, 2025 14:36
@aborgna-q aborgna-q changed the title chore: Update uv.lock on release release-please PRs chore: Update uv.lock on release-please PRs Mar 18, 2025
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.19%. Comparing base (37b8b80) to head (e0e813c).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #870   +/-   ##
=======================================
  Coverage   93.19%   93.19%           
=======================================
  Files          74       74           
  Lines        8786     8786           
=======================================
  Hits         8188     8188           
  Misses        598      598           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Member

@ss2165 ss2165 left a comment

Choose a reason for hiding this comment

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

pls wait for release before merging (I know it shouldn't matter but paranoia)

@aborgna-q aborgna-q changed the title chore: Update uv.lock on release-please PRs ci: Update uv.lock on release-please PRs Mar 18, 2025
@aborgna-q aborgna-q enabled auto-merge March 18, 2025 15:17
@aborgna-q aborgna-q added this pull request to the merge queue Mar 18, 2025
Merged via the queue into main with commit 8ad8174 Mar 18, 2025
5 checks passed
@aborgna-q aborgna-q deleted the ab/release-please-lock branch March 18, 2025 15:22
@konstin
Copy link

konstin commented Mar 20, 2025

I wasn't expecting astral-sh/uv#12235 to break any existing workflows or require manual edits to uv.lock, do you mind sharing what your release workflow is / how this PR broke it?

@aborgna-q
Copy link
Collaborator Author

aborgna-q commented Mar 20, 2025

@konstin Hi! Sorry for the noisy back-links.

The workflow here is running googleapis/release-please to automatically create release PRs with including changelog entries and bumped package versions.

The version update logic is quite simple, and manually edits the version in a couple pre-determined places (pyproject.toml, package.__version__, etc.) but does not include uv.lock. This seems similar to the issue with dependabot mentioned in your PR.

I rolled back this change in a fork and updated uv to show the error.
See this automatically-generated release PR: aborgna-q#4
And failing CI check.

Note that the check workflow only fails if we run uv with --locked. We instead use --frozen in some places, and that doesn't raise issues.

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.

4 participants