fixup! fixup! fixup! cleanup the config settings implementation and m…

…ark the types as internal
bazelbuild · Sep 17, 2024 · 1919e62 · 1919e62
1 parent 5793274
commit 1919e62
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/examples/bzlmod/MODULE.bazel.lock b/examples/bzlmod/MODULE.bazel.lock
diff --git a/python/private/config_settings.bzl b/python/private/config_settings.bzl
@@ -20,7 +20,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load(":semver.bzl", "semver")
 
 _PYTHON_VERSION_FLAG = Label("//python/config_settings:python_version")
-_PYTHON_MAJOR_MINOR_VERSION_FLAG = Label("//python/config_settings:_python_major_minor_version")
+_PYTHON_VERSION_MAJOR_MINOR_FLAG = Label("//python/config_settings:_python_version_major_minor")
 
 def construct_config_settings(*, name, versions, minor_mapping):  # buildifier: disable=function-docstring
     """Create a 'python_version' config flag and construct all config settings used in rules_python.
@@ -45,7 +45,7 @@ def construct_config_settings(*, name, versions, minor_mapping):  # buildifier:
     )
 
     _python_version_major_minor_flag(
-        name = _PYTHON_MAJOR_MINOR_VERSION_FLAG.name,
+        name = _PYTHON_VERSION_MAJOR_MINOR_FLAG.name,
         build_setting_default = "",
         visibility = ["//visibility:public"],
     )
@@ -100,7 +100,7 @@ def construct_config_settings(*, name, versions, minor_mapping):  # buildifier:
     for minor in minor_mapping.keys():
         native.config_setting(
             name = "is_python_{}".format(minor),
-            flag_values = {_PYTHON_MAJOR_MINOR_VERSION_FLAG: minor},
+            flag_values = {_PYTHON_VERSION_MAJOR_MINOR_FLAG: minor},
             visibility = ["//visibility:public"],
         )
 

diff --git a/python/private/pypi/generate_whl_library_build_bazel.bzl b/python/private/pypi/generate_whl_library_build_bazel.bzl
@@ -162,7 +162,7 @@ def _render_config_settings(dependencies_by_platform):
 config_setting(
     name = "is_{name}",
     flag_values = {{
-        "@rules_python//python/config_settings:python_version_major_minor": "3.{minor_version}",
+        "@rules_python//python/config_settings:_python_version_major_minor": "3.{minor_version}",
     }},
     constraint_values = {constraint_values},
     visibility = ["//visibility:private"],

diff --git a/tests/config_settings/construct_config_settings_tests.bzl b/tests/config_settings/construct_config_settings_tests.bzl
@@ -167,7 +167,7 @@ def construct_config_settings_test_suite(name):  # buildifier: disable=function-
                 "@platforms//os:" + os,
             ],
             flag_values = {
-                "//python/config_settings:python_version_major_minor": "3.11",
+                "//python/config_settings:_python_version_major_minor": "3.11",
             },
         )
 
@@ -178,7 +178,7 @@ def construct_config_settings_test_suite(name):  # buildifier: disable=function-
                 "@platforms//cpu:" + cpu,
             ],
             flag_values = {
-                "//python/config_settings:python_version_major_minor": "3.11",
+                "//python/config_settings:_python_version_major_minor": "3.11",
             },
         )
 
@@ -198,7 +198,7 @@ def construct_config_settings_test_suite(name):  # buildifier: disable=function-
                 "@platforms//os:" + os,
             ],
             flag_values = {
-                "//python/config_settings:python_version_major_minor": "3.11",
+                "//python/config_settings:_python_version_major_minor": "3.11",
             },
         )
 

diff --git a/tests/pypi/generate_whl_library_build_bazel/generate_whl_library_build_bazel_tests.bzl b/tests/pypi/generate_whl_library_build_bazel/generate_whl_library_build_bazel_tests.bzl
@@ -160,7 +160,7 @@ py_library(
 config_setting(
     name = "is_python_3.10_linux_ppc",
     flag_values = {
-        "@rules_python//python/config_settings:python_version_major_minor": "3.10",
+        "@rules_python//python/config_settings:_python_version_major_minor": "3.10",
     },
     constraint_values = [
         "@platforms//cpu:ppc",
@@ -172,7 +172,7 @@ config_setting(
 config_setting(
     name = "is_python_3.9_anyos_aarch64",
     flag_values = {
-        "@rules_python//python/config_settings:python_version_major_minor": "3.9",
+        "@rules_python//python/config_settings:_python_version_major_minor": "3.9",
     },
     constraint_values = ["@platforms//cpu:aarch64"],
     visibility = ["//visibility:private"],
@@ -181,7 +181,7 @@ config_setting(
 config_setting(
     name = "is_python_3.9_linux_anyarch",
     flag_values = {
-        "@rules_python//python/config_settings:python_version_major_minor": "3.9",
+        "@rules_python//python/config_settings:_python_version_major_minor": "3.9",
     },
     constraint_values = ["@platforms//os:linux"],
     visibility = ["//visibility:private"],