(chore): Remove the extra indirection and bzlmod folder (bazel-contrib#2022)

groodt · web-flow · commit 084b877c98b5 · 2024-07-01T10:23:36.000Z
The `bzlmod` folder seems like unnecessary indirection now. It was
perhaps useful as we developed bzlmod support, but we no longer need it
and it makes navigating the repository more difficult.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -13,7 +13,7 @@ bazel_dep(name = "platforms", version = "0.0.4")
 bazel_dep(name = "rules_proto", version = "6.0.0-rc1")
 bazel_dep(name = "protobuf", version = "24.4", repo_name = "com_google_protobuf")
 
-internal_deps = use_extension("//python/private/bzlmod:internal_deps.bzl", "internal_deps")
+internal_deps = use_extension("//python/private:internal_deps.bzl", "internal_deps")
 use_repo(
     internal_deps,
     "pypi__build",
@@ -54,7 +54,7 @@ register_toolchains("@pythons_hub//:all")
 #####################
 # Install twine for our own runfiles wheel publishing and allow bzlmod users to use it.
 
-pip = use_extension("//python/private/bzlmod:pip.bzl", "pip_internal")
+pip = use_extension("//python/private/pypi:pip.bzl", "pip_internal")
 pip.parse(
     hub_name = "rules_python_publish_deps",
     python_version = "3.11",
@@ -77,7 +77,7 @@ bazel_dep(name = "rules_go", version = "0.41.0", dev_dependency = True, repo_nam
 bazel_dep(name = "gazelle", version = "0.33.0", dev_dependency = True, repo_name = "bazel_gazelle")
 
 dev_pip = use_extension(
-    "//python/private/bzlmod:pip.bzl",
+    "//python/private/pypi:pip.bzl",
     "pip_internal",
     dev_dependency = True,
 )
diff --git a/python/extensions/BUILD.bazel b/python/extensions/BUILD.bazel
@@ -28,14 +28,14 @@ bzl_library(
     name = "pip_bzl",
     srcs = ["pip.bzl"],
     visibility = ["//:__subpackages__"],
-    deps = ["//python/private/bzlmod:pip_bzl"],
+    deps = ["//python/private/pypi:pip_bzl"],
 )
 
 bzl_library(
     name = "python_bzl",
     srcs = ["python.bzl"],
     visibility = ["//:__subpackages__"],
     deps = [
-        "//python/private/bzlmod:python_bzl",
+        "//python/private:python_bzl",
     ],
 )
diff --git a/python/extensions/pip.bzl b/python/extensions/pip.bzl
@@ -14,6 +14,6 @@
 
 "pip module extension for use with bzlmod"
 
-load("//python/private/bzlmod:pip.bzl", _pip = "pip")
+load("//python/private/pypi:pip.bzl", _pip = "pip")
 
 pip = _pip
diff --git a/python/extensions/python.bzl b/python/extensions/python.bzl
@@ -14,6 +14,6 @@
 
 "Python toolchain module extensions for use with bzlmod"
 
-load("//python/private/bzlmod:python.bzl", _python = "python")
+load("//python/private:python.bzl", _python = "python")
 
 python = _python
diff --git a/python/private/BUILD.bazel b/python/private/BUILD.bazel
@@ -29,7 +29,6 @@ licenses(["notice"])
 filegroup(
     name = "distribution",
     srcs = glob(["**"]) + [
-        "//python/private/bzlmod:distribution",
         "//python/private/common:distribution",
         "//python/private/proto:distribution",
         "//python/private/pypi:distribution",
@@ -128,6 +127,28 @@ bzl_library(
     srcs = ["normalize_name.bzl"],
 )
 
+bzl_library(
+    name = "python_bzl",
+    srcs = ["python.bzl"],
+    deps = [
+        ":pythons_hub_bzl",
+        ":toolchains_repo_bzl",
+        ":util_bzl",
+        "//python:repositories_bzl",
+        "@bazel_features//:features",
+    ],
+)
+
+bzl_library(
+    name = "pythons_hub_bzl",
+    srcs = ["pythons_hub.bzl"],
+    deps = [
+        ":full_version_bzl",
+        ":py_toolchain_suite_bzl",
+        "//python:versions_bzl",
+    ],
+)
+
 bzl_library(
     name = "py_cc_toolchain_bzl",
     srcs = [
diff --git a/python/private/bzlmod/BUILD.bazel b/python/private/bzlmod/BUILD.bazel
diff --git a/python/private/internal_deps.bzl b/python/private/internal_deps.bzl
@@ -9,8 +9,8 @@
 "Python toolchain module extension for internal rule use"
 
 load("@bazel_skylib//lib:modules.bzl", "modules")
-load("//python/private:internal_config_repo.bzl", "internal_config_repo")
 load("//python/private/pypi:deps.bzl", "pypi_deps")
+load(":internal_config_repo.bzl", "internal_config_repo")
 
 def _internal_deps():
     internal_config_repo(name = "rules_python_internal")
diff --git a/python/private/pypi/BUILD.bazel b/python/private/pypi/BUILD.bazel
@@ -55,8 +55,8 @@ bzl_library(
 )
 
 bzl_library(
-    name = "bzlmod_bzl",
-    srcs = ["bzlmod.bzl"],
+    name = "extension_bzl",
+    srcs = ["extension.bzl"],
     deps = [
         ":attrs_bzl",
         ":hub_repository_bzl",
@@ -190,6 +190,14 @@ bzl_library(
     ],
 )
 
+bzl_library(
+    name = "pip_bzl",
+    srcs = ["pip.bzl"],
+    deps = [
+        ":extension_bzl",
+    ],
+)
+
 bzl_library(
     name = "pip_compile_bzl",
     srcs = ["pip_compile.bzl"],
diff --git a/python/private/pypi/extension.bzl b/python/private/pypi/extension.bzl
diff --git a/python/private/pypi/pip.bzl b/python/private/pypi/pip.bzl
@@ -14,7 +14,7 @@
 
 "pip module extensions for use with bzlmod."
 
-load("//python/private/pypi:bzlmod.bzl", "pypi", "pypi_internal")
+load("//python/private/pypi:extension.bzl", "pypi", "pypi_internal")
 
 pip = pypi
 pip_internal = pypi_internal
diff --git a/python/private/python.bzl b/python/private/python.bzl
@@ -16,9 +16,9 @@
 
 load("@bazel_features//:features.bzl", "bazel_features")
 load("//python:repositories.bzl", "python_register_toolchains")
-load("//python/private:toolchains_repo.bzl", "multi_toolchain_aliases")
-load("//python/private:util.bzl", "IS_BAZEL_6_4_OR_HIGHER")
 load(":pythons_hub.bzl", "hub_repo")
+load(":toolchains_repo.bzl", "multi_toolchain_aliases")
+load(":util.bzl", "IS_BAZEL_6_4_OR_HIGHER")
 
 # This limit can be increased essentially arbitrarily, but doing so will cause a rebuild of all
 # targets using any of these toolchains due to the changed repository name.
diff --git a/python/private/pythons_hub.bzl b/python/private/pythons_hub.bzl
