From 78bea9d4178aa33acb5360c8eb6958bd131f2d5f Mon Sep 17 00:00:00 2001 From: Greg Date: Sun, 23 Jun 2024 08:56:23 +1000 Subject: [PATCH 1/3] Remove unused substitution. --- python/pip_install/pip_repository.bzl | 2 +- ...quirements.bzl.tmpl => pip_repository_requirements.bzl.tpl} | 0 python/private/bzlmod/pip_repository.bzl | 3 +-- .../bzlmod/{requirements.bzl.tmpl => requirements.bzl.tpl} | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename python/pip_install/{pip_repository_requirements.bzl.tmpl => pip_repository_requirements.bzl.tpl} (100%) rename python/private/bzlmod/{requirements.bzl.tmpl => requirements.bzl.tpl} (100%) diff --git a/python/pip_install/pip_repository.bzl b/python/pip_install/pip_repository.bzl index d6c8d9149c..69c329e679 100644 --- a/python/pip_install/pip_repository.bzl +++ b/python/pip_install/pip_repository.bzl @@ -667,7 +667,7 @@ True will become default in a subsequent release. """, ), "_template": attr.label( - default = ":pip_repository_requirements.bzl.tmpl", + default = ":pip_repository_requirements.bzl.tpl", ), } diff --git a/python/pip_install/pip_repository_requirements.bzl.tmpl b/python/pip_install/pip_repository_requirements.bzl.tpl similarity index 100% rename from python/pip_install/pip_repository_requirements.bzl.tmpl rename to python/pip_install/pip_repository_requirements.bzl.tpl diff --git a/python/private/bzlmod/pip_repository.bzl b/python/private/bzlmod/pip_repository.bzl index d42eb8b056..67807a5f41 100644 --- a/python/private/bzlmod/pip_repository.bzl +++ b/python/private/bzlmod/pip_repository.bzl @@ -63,7 +63,6 @@ def _pip_repository_impl(rctx): for p in bzl_packages }), "%%MACRO_TMPL%%": macro_tmpl, - "%%NAME%%": rctx.attr.repo_name, }) pip_repository_attrs = { @@ -89,7 +88,7 @@ in the pip.parse tag class. """, ), "_template": attr.label( - default = ":requirements.bzl.tmpl", + default = ":requirements.bzl.tpl", ), } diff --git a/python/private/bzlmod/requirements.bzl.tmpl b/python/private/bzlmod/requirements.bzl.tpl similarity index 100% rename from python/private/bzlmod/requirements.bzl.tmpl rename to python/private/bzlmod/requirements.bzl.tpl From 3721487401ef654a6c21fdac23b918c085ef7550 Mon Sep 17 00:00:00 2001 From: Greg Date: Sun, 23 Jun 2024 09:03:07 +1000 Subject: [PATCH 2/3] Remove unused substitution. --- python/pip_install/BUILD.bazel | 2 +- python/pip_install/pip_repository.bzl | 2 +- ...equirements.bzl.tpl => pip_repository_requirements.bzl.tmpl} | 0 python/private/bzlmod/pip_repository.bzl | 2 +- .../bzlmod/{requirements.bzl.tpl => requirements.bzl.tmpl} | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename python/pip_install/{pip_repository_requirements.bzl.tpl => pip_repository_requirements.bzl.tmpl} (100%) rename python/private/bzlmod/{requirements.bzl.tpl => requirements.bzl.tmpl} (100%) diff --git a/python/pip_install/BUILD.bazel b/python/pip_install/BUILD.bazel index 91f2ec7b59..8ed258426a 100644 --- a/python/pip_install/BUILD.bazel +++ b/python/pip_install/BUILD.bazel @@ -70,7 +70,7 @@ filegroup( name = "distribution", srcs = glob(["*.bzl"]) + [ "BUILD.bazel", - "pip_repository_requirements.bzl.tmpl", + "pip_repository_requirements.bzl.tpl", "//python/pip_install/private:distribution", "//python/pip_install/tools/dependency_resolver:distribution", "//python/pip_install/tools/wheel_installer:distribution", diff --git a/python/pip_install/pip_repository.bzl b/python/pip_install/pip_repository.bzl index 69c329e679..d6c8d9149c 100644 --- a/python/pip_install/pip_repository.bzl +++ b/python/pip_install/pip_repository.bzl @@ -667,7 +667,7 @@ True will become default in a subsequent release. """, ), "_template": attr.label( - default = ":pip_repository_requirements.bzl.tpl", + default = ":pip_repository_requirements.bzl.tmpl", ), } diff --git a/python/pip_install/pip_repository_requirements.bzl.tpl b/python/pip_install/pip_repository_requirements.bzl.tmpl similarity index 100% rename from python/pip_install/pip_repository_requirements.bzl.tpl rename to python/pip_install/pip_repository_requirements.bzl.tmpl diff --git a/python/private/bzlmod/pip_repository.bzl b/python/private/bzlmod/pip_repository.bzl index 67807a5f41..82682d212f 100644 --- a/python/private/bzlmod/pip_repository.bzl +++ b/python/private/bzlmod/pip_repository.bzl @@ -88,7 +88,7 @@ in the pip.parse tag class. """, ), "_template": attr.label( - default = ":requirements.bzl.tpl", + default = ":requirements.bzl.tmpl", ), } diff --git a/python/private/bzlmod/requirements.bzl.tpl b/python/private/bzlmod/requirements.bzl.tmpl similarity index 100% rename from python/private/bzlmod/requirements.bzl.tpl rename to python/private/bzlmod/requirements.bzl.tmpl From 18a771ea4a5bd47bccb0a26a108b57015511d604 Mon Sep 17 00:00:00 2001 From: Greg Date: Sun, 23 Jun 2024 09:03:44 +1000 Subject: [PATCH 3/3] Remove unused substitution. --- python/pip_install/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pip_install/BUILD.bazel b/python/pip_install/BUILD.bazel index 8ed258426a..91f2ec7b59 100644 --- a/python/pip_install/BUILD.bazel +++ b/python/pip_install/BUILD.bazel @@ -70,7 +70,7 @@ filegroup( name = "distribution", srcs = glob(["*.bzl"]) + [ "BUILD.bazel", - "pip_repository_requirements.bzl.tpl", + "pip_repository_requirements.bzl.tmpl", "//python/pip_install/private:distribution", "//python/pip_install/tools/dependency_resolver:distribution", "//python/pip_install/tools/wheel_installer:distribution",