Skip to content

Commit changes to workspace member TOML files #15142

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.

Sign up for GitHub

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

Open
crabbit-git wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Open

Commit changes to workspace member TOML files #15142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion uv/lib/dependabot/uv/file_updater/lock_file_updater.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,15 @@ def fetch_updated_dependency_files
updated_files = pyproject_files.filter_map do |file|
next unless file_changed?(file)

updated_file(
updated = updated_file(
file: file,
content: T.must(updated_pyproject_content_for(file))
)
# support_file must be false to prevent DependencyChangeBuilder from discarding the inner TOML,
# since doing so causes a conflict between the updated lock file and the committed TOML
# and breaks `uv sync --locked` in CI.
updated.support_file = false
updated
end

if lockfile && !build_system_only_dependency?
Expand Down
1 change: 1 addition & 0 deletions uv/spec/dependabot/uv/file_updater/lock_file_updater_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@

member_pyproject = updated_dependency_files.find { |f| f.name == "packages/my-package/pyproject.toml" }
expect(member_pyproject.content).to include('"click>=8.2.0"')
expect(member_pyproject.support_file).to be(false)

updated_lock = updated_dependency_files.find { |f| f.name == "uv.lock" }
expect(updated_lock.content).to include('version = "8.2.0"')
Expand Down
Loading