fix(pypi): make requirements_lock optional in multi_pip_parse (#4430) `multi_pip_parse` required `requirements_lock` as a positional argument, preventing `WORKSPACE` users from passing `uv_lock` instead. Default `requirements_lock` to `None` in `multi_pip_parse` and forward it through `**kwargs` in the generated toolchain wrapper macro.
diff --git a/news/workspace-uv-lock.added.md b/news/workspace-uv-lock.added.md index 70cd1e2..105e51d 100644 --- a/news/workspace-uv-lock.added.md +++ b/news/workspace-uv-lock.added.md
@@ -1,3 +1,3 @@ -(pypi) {obj}`pip_parse` now supports `uv.lock` files via the -{attr}`pip_parse.uv_lock` attribute, so `WORKSPACE` users can consume the -`uv.lock` files generated by {obj}`lock`. +(pypi) {obj}`pip_parse` and {obj}`multi_pip_parse` now support `uv.lock` files +via the {attr}`pip_parse.uv_lock` attribute, so `WORKSPACE` users can consume +the `uv.lock` files generated by {obj}`lock`.
diff --git a/python/private/pypi/multi_pip_parse.bzl b/python/private/pypi/multi_pip_parse.bzl index 60496c2..96c3320 100644 --- a/python/private/pypi/multi_pip_parse.bzl +++ b/python/private/pypi/multi_pip_parse.bzl
@@ -124,7 +124,14 @@ }, ) -def multi_pip_parse(name, default_version, python_versions, python_interpreter_target, requirements_lock, minor_mapping, **kwargs): +def multi_pip_parse( + name, + default_version, + python_versions, + python_interpreter_target, + minor_mapping, + requirements_lock = None, + **kwargs): """NOT INTENDED FOR DIRECT USE! This is intended to be used by the multi_pip_parse implementation in the template of the @@ -135,8 +142,10 @@ default_version: {type}`str` the default Python version. python_versions: {type}`list[str]` all Python toolchain versions currently registered. python_interpreter_target: {type}`dict[str, Label]` a dictionary which keys are Python versions and values are resolved host interpreters. - requirements_lock: {type}`dict[str, Label]` a dictionary which keys are Python versions and values are locked requirements files. minor_mapping: {type}`dict[str, str]` mapping between `X.Y` to `X.Y.Z` format. + requirements_lock: {type}`dict[str, Label] | None` an optional + dictionary whose keys are Python versions and values are locked + requirements files. **kwargs: extra arguments passed to all wrapped pip_parse. Returns: @@ -146,14 +155,22 @@ for python_version in python_versions: if not python_version in python_interpreter_target: fail("Missing python_interpreter_target for Python version %s in '%s'" % (python_version, name)) - if not python_version in requirements_lock: - fail("Missing requirements_lock for Python version %s in '%s'" % (python_version, name)) + version_requirements_lock = None + if requirements_lock != None: + if not python_version in requirements_lock: + fail( + "Missing requirements_lock for Python version %s in '%s'" % ( + python_version, + name, + ), + ) + version_requirements_lock = requirements_lock[python_version] pip_parse_name = name + "_" + python_version.replace(".", "_") pip_parse( name = pip_parse_name, python_interpreter_target = python_interpreter_target[python_version], - requirements_lock = requirements_lock[python_version], + requirements_lock = version_requirements_lock, **kwargs ) pip_parses[python_version] = pip_parse_name
diff --git a/python/private/toolchains_repo.bzl b/python/private/toolchains_repo.bzl index 14f7651..0027014 100644 --- a/python/private/toolchains_repo.bzl +++ b/python/private/toolchains_repo.bzl
@@ -172,11 +172,10 @@ load("@@{rules_python}//python:pip.bzl", "pip_parse", _multi_pip_parse = "multi_pip_parse") -def multi_pip_parse(name, requirements_lock, **kwargs): +def multi_pip_parse(name, **kwargs): return _multi_pip_parse( name = name, python_versions = {python_versions}, - requirements_lock = requirements_lock, minor_mapping = {minor_mapping}, **kwargs )