feat: add bzlmod and use macro_tmpl for expansion in pip_repository

aignas · aignas · commit 8e501287c062 · 2023-05-05T20:08:54.000+09:00
diff --git a/python/pip_install/pip_repository.bzl b/python/pip_install/pip_repository.bzl
@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
     rctx.file("BUILD.bazel", build_contents)
     rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
         "%%ALL_REQUIREMENTS%%": _format_repr_list([
-            "@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
+            macro_tmpl.format(p, "pkg")
             for p in bzl_packages
         ]),
         "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
-            "@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
+            macro_tmpl.format(p, "whl")
             for p in bzl_packages
         ]),
         "%%MACRO_TMPL%%": macro_tmpl,
diff --git a/tests/pip_parse/MODULE.bazel b/tests/pip_parse/MODULE.bazel
@@ -0,0 +1,45 @@
+module(
+    name = "example_bzlmod",
+    version = "0.0.0",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.3.0")
+bazel_dep(name = "rules_python", version = "0.0.0")
+local_path_override(
+    module_name = "rules_python",
+    path = "../..",
+)
+
+python = use_extension("@rules_python//python:extensions.bzl", "python")
+python.toolchain(
+    name = "python3_9",
+    configure_coverage_tool = True,
+    python_version = "3.9",
+)
+use_repo(
+    python,
+    "python3_9",
+    "python3_9_host_interpreter",
+    "python3_9_toolchains",
+)
+
+register_toolchains(
+    "@python3_9_toolchains//:all",
+)
+
+pip = use_extension("@rules_python//python:extensions.bzl", "pip")
+pip.parse(
+    name = "pypi",
+    python_interpreter_target = "@python3_9_host_interpreter//:python",
+    requirements_lock = "//:requirements_lock.txt",
+    requirements_windows = "//:requirements_windows.txt",
+)
+pip.parse(
+    name = "pypi_aliases",
+    incompatible_generate_aliases = True,
+    python_interpreter_target = "@python3_9_host_interpreter//:python",
+    requirements_lock = "//:requirements_lock.txt",
+    requirements_windows = "//:requirements_windows.txt",
+)
+use_repo(pip, "pypi", "pypi_aliases")
diff --git a/tests/pip_parse/WORKSPACE.bzlmod b/tests/pip_parse/WORKSPACE.bzlmod
