Skip to content

fix: avoid repo name collision for multi-version packages in uv.lock #795

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
roundhd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: avoid repo name collision for multi-version packages in uv.lock #795

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
18 changes: 15 additions & 3 deletions uv/private/extension.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,10 +513,16 @@ def _raw_whl_repos(_module_ctx, lock_specs, override_specs):
def _sbuild_repo_name(hub, venv, package):
"""Get the repo name for a sdist build."""

return "sbuild__{}__{}__{}".format(
# Include version hash to avoid collisions when uv.lock contains multiple
# versions of the same package (e.g., python-version-conditional deps).
# Use sha1 of version since version strings may contain chars invalid
# in Bazel repo names (e.g., '+' in dev versions like 0.7.0.dev40+g1fa30273b).
version_id = sha1(package.get("version", "0"))[:8]
return "sbuild__{}__{}__{}__{}".format(
hub,
venv,
package["name"],
version_id,
)

def _venv_target(hub_name, venv, package_name):
Expand Down Expand Up @@ -590,10 +596,14 @@ def _sbuild_repos(_module_ctx, lock_specs, annotation_specs, override_specs):
def _whl_install_repo_name(hub, venv, package):
"""Get the whl install repo name for a given package."""

return "whl_install__{}__{}__{}".format(
# Include version hash to avoid collisions when uv.lock contains multiple
# versions of the same package (e.g., python-version-conditional deps).
version_id = sha1(package.get("version", "0"))[:8]
return "whl_install__{}__{}__{}__{}".format(
hub,
venv,
package["name"],
version_id,
)

# TODO: Move this to a real library
Expand Down Expand Up @@ -851,7 +861,9 @@ def _group_repos(module_ctx, lock_specs, entrypoint_specs, override_specs):
installs = {
# Use an override symbol if one exists, otherwise use the whl install repo.
# Note that applying an override will cause the whl install to be elided.
package: str(overrides.get(package, _whl_install_repo_name(hub_name, venv_name, {"name": package})))
# Pass the full package dict (with version) so _whl_install_repo_name
# can compute the correct version-hashed repo name.
package: str(overrides.get(package, _whl_install_repo_name(hub_name, venv_name, packages[package])))
for package in sorted(graph.keys())
},
entrypoints = json.encode(entrypoint_specs),
Expand Down