Skip to content

fix(pypi): handle revisions in uv.lock Git sources #4086

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
henriquejsza wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −5
Open

fix(pypi): handle revisions in uv.lock Git sources #4086

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
3 changes: 3 additions & 0 deletions news/4084.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(pypi) Fixed {obj}`pip.parse` repository names for Git sources in `uv.lock`
files by excluding URL query and fragment components
([#4084](https://github.com/bazel-contrib/rules_python/issues/4084)).
6 changes: 5 additions & 1 deletion python/private/pypi/parse_requirements.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,11 @@ def _parse_uv_lock_json(uv_lock, all_platforms, logger, extra_pip_args = None, p
git_struct = None
if pkg.get("source", {}).get("git"):
url = pkg["source"]["git"]
_, _, filename = url.rpartition("/")

# Keep the revision in the URL, but exclude it from the repository filename.
url_path, _, _ = url.partition("?")
url_path, _, _ = url_path.partition("#")
_, _, filename = url_path.rpartition("/")
git_struct = struct(
filename = filename,
url = url,
Expand Down
8 changes: 4 additions & 4 deletions tests/pypi/parse_requirements/parse_requirements_tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ bar==0.0.1 --hash=sha256:deadb00f
"uv_lock_foo_sha512": """{"package":[{"name":"foo","source":{"registry":"https://pypi.org/simple"},"version":"0.0.1","wheels":[{"hash":"sha512:deadbeef","url":"https://files.pythonhosted.org/packages/foo-0.0.1-py3-none-any.whl"}]}]}""",
"uv_lock_foo_virtual": """{"package":[{"name":"foo","source":{"registry":"https://pypi.org/simple"},"version":"0.0.1","wheels":[{"hash":"sha256:deadbeef","url":"https://files.pythonhosted.org/packages/foo-0.0.1-py3-none-any.whl"}]},{"name":"virtual-pkg","source":{"virtual":true},"version":"0.0.0"}]}""",
"uv_lock_foo_with_extras": """{"package":[{"name":"foo","provides-extras":["extra"],"source":{"registry":"https://pypi.org/simple"},"version":"0.0.1","wheels":[{"hash":"sha256:deadbeef","url":"https://files.pythonhosted.org/packages/foo-0.0.1-py3-none-any.whl"}]}]}""",
"uv_lock_git_vcs": """{"package":[{"name":"foo","source":{"git":"https://github.com/org/foo.git"},"version":"0.1.0"}]}""",
"uv_lock_git_vcs": """{"package":[{"name":"foo","source":{"git":"https://github.com/org/foo?rev=deadbeef#deadbeef"},"version":"0.1.0"}]}""",
"uv_lock_rules_python_pkg": """{"package":[{"name":"rules_python","source":{"registry":"https://pypi.org/simple"},"version":"0.0.1","wheels":[{"hash":"sha256:deadbeef","url":"https://files.pythonhosted.org/packages/rules_python-0.0.1-py3-none-any.whl"}]}]}""",
}

Expand Down Expand Up @@ -1321,7 +1321,7 @@ def _test_uv_lock_cross_consistent(env):
_tests.append(_test_uv_lock_cross_consistent)

def _test_uv_lock_vcs_entry(env):
"""Test that VCS entries in uv.lock are handled without crashing."""
"""Test that VCS entry filenames exclude URL query and fragment components."""
got = parse_requirements(
uv_lock = "uv_lock_git_vcs",
)
Expand All @@ -1337,9 +1337,9 @@ def _test_uv_lock_vcs_entry(env):
extra_pip_args = [],
requirement_line = "foo==0.1.0",
target_platforms = ["linux_x86_64"],
filename = "foo.git",
filename = "foo",
digest = "",
url = "https://github.com/org/foo.git",
url = "https://github.com/org/foo?rev=deadbeef#deadbeef",
yanked = None,
),
],
Expand Down