From 7b52502aa0b59df13621d6c023521647dad0439b Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Wed, 10 Dec 2025 15:32:57 +0000 Subject: [PATCH 01/12] add flag_alias definition for Starlarkification of python flags --- MODULE.bazel | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MODULE.bazel b/MODULE.bazel index b909124d11..f023e5511b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -451,3 +451,8 @@ uv_dev = use_extension( uv_dev.configure( version = "0.6.2", ) + +flag_alias("build_python_zip", "//python/config_settings:build_python_zip") +flag_alias("incompatible_default_to_explicit_init_py", "//python/config_settings:incompatible_default_to_explicit_init_py") +flag_alias("python_path", "//python/config_settings:python_path") +flag_alias("experimental_python_import_all_repositories", "//python/config_settings:experimental_python_import_all_repositories") From 5c6539e2ab4aa1e3b3dcc7e9c5a36ad6370611bf Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Thu, 18 Dec 2025 15:30:17 +0000 Subject: [PATCH 02/12] fix error --- MODULE.bazel | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 0f71491daf..1e9f269a11 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -459,7 +459,7 @@ uv_dev.configure( version = "0.6.2", ) -flag_alias("build_python_zip", "//python/config_settings:build_python_zip") -flag_alias("incompatible_default_to_explicit_init_py", "//python/config_settings:incompatible_default_to_explicit_init_py") -flag_alias("python_path", "//python/config_settings:python_path") -flag_alias("experimental_python_import_all_repositories", "//python/config_settings:experimental_python_import_all_repositories") +flag_alias(name = "build_python_zip", starlark_flag = "//python/config_settings:build_python_zip") +flag_alias(name = "incompatible_default_to_explicit_init_py", starlark_flag = "//python/config_settings:incompatible_default_to_explicit_init_py") +flag_alias(name = "python_path", starlark_flag = "//python/config_settings:python_path") +flag_alias(name = "experimental_python_import_all_repositories", starlark_flag = "//python/config_settings:experimental_python_import_all_repositories") From 504ccf3a74e283fe7f76b413221e40cef180ed53 Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Thu, 18 Dec 2025 17:31:18 +0000 Subject: [PATCH 03/12] use starlark flags instead --- tests/base_rules/py_executable_base_tests.bzl | 2 +- tests/config_settings/transition/multi_version_tests.bzl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/base_rules/py_executable_base_tests.bzl b/tests/base_rules/py_executable_base_tests.bzl index ed1a55021d..45d1ffe667 100644 --- a/tests/base_rules/py_executable_base_tests.bzl +++ b/tests/base_rules/py_executable_base_tests.bzl @@ -93,7 +93,7 @@ def _test_basic_zip(name, config): # platforms. # Pass value to both native and starlark versions of the flag until # the native one is removed. - "//command_line_option:build_python_zip": "true", + "@@//python/config_settings:build_python_zip": "true", labels.BUILD_PYTHON_ZIP: True, "//command_line_option:cpu": "linux_x86_64", "//command_line_option:crosstool_top": CROSSTOOL_TOP, diff --git a/tests/config_settings/transition/multi_version_tests.bzl b/tests/config_settings/transition/multi_version_tests.bzl index 05f010562c..f0864d8bf0 100644 --- a/tests/config_settings/transition/multi_version_tests.bzl +++ b/tests/config_settings/transition/multi_version_tests.bzl @@ -92,7 +92,7 @@ def _setup_py_binary_windows(name, *, impl, build_python_zip): target = name + "_subject", impl = impl, config_settings = { - "//command_line_option:build_python_zip": str(build_python_zip), + "@@//python/config_settings:build_python_zip": str(build_python_zip), labels.BUILD_PYTHON_ZIP: build_python_zip, "//command_line_option:extra_toolchains": CC_TOOLCHAIN, "//command_line_option:platforms": str(platform_targets.WINDOWS_X86_64), From effbe4cd6c4428cdb7c15bf8d645a5e97a89b9f1 Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Thu, 18 Dec 2025 18:05:51 +0000 Subject: [PATCH 04/12] fix starlark label --- tests/base_rules/py_executable_base_tests.bzl | 2 +- tests/config_settings/transition/multi_version_tests.bzl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/base_rules/py_executable_base_tests.bzl b/tests/base_rules/py_executable_base_tests.bzl index 45d1ffe667..a946bf7e89 100644 --- a/tests/base_rules/py_executable_base_tests.bzl +++ b/tests/base_rules/py_executable_base_tests.bzl @@ -93,7 +93,7 @@ def _test_basic_zip(name, config): # platforms. # Pass value to both native and starlark versions of the flag until # the native one is removed. - "@@//python/config_settings:build_python_zip": "true", + "//python/config_settings:build_python_zip": "true", labels.BUILD_PYTHON_ZIP: True, "//command_line_option:cpu": "linux_x86_64", "//command_line_option:crosstool_top": CROSSTOOL_TOP, diff --git a/tests/config_settings/transition/multi_version_tests.bzl b/tests/config_settings/transition/multi_version_tests.bzl index f0864d8bf0..e025abbb4c 100644 --- a/tests/config_settings/transition/multi_version_tests.bzl +++ b/tests/config_settings/transition/multi_version_tests.bzl @@ -85,14 +85,14 @@ def _setup_py_binary_windows(name, *, impl, build_python_zip): name = name + "_subject", srcs = [name + "_subject.py"], python_version = _PYTHON_VERSION, - ) +i ) analysis_test( name = name, target = name + "_subject", impl = impl, config_settings = { - "@@//python/config_settings:build_python_zip": str(build_python_zip), + "//python/config_settings:build_python_zip": str(build_python_zip), labels.BUILD_PYTHON_ZIP: build_python_zip, "//command_line_option:extra_toolchains": CC_TOOLCHAIN, "//command_line_option:platforms": str(platform_targets.WINDOWS_X86_64), From e7bc46429872213408dae77a217ed33051dd03da Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Thu, 18 Dec 2025 18:22:02 +0000 Subject: [PATCH 05/12] remove extra character --- tests/config_settings/transition/multi_version_tests.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/config_settings/transition/multi_version_tests.bzl b/tests/config_settings/transition/multi_version_tests.bzl index e025abbb4c..b9b8a6b482 100644 --- a/tests/config_settings/transition/multi_version_tests.bzl +++ b/tests/config_settings/transition/multi_version_tests.bzl @@ -85,7 +85,7 @@ def _setup_py_binary_windows(name, *, impl, build_python_zip): name = name + "_subject", srcs = [name + "_subject.py"], python_version = _PYTHON_VERSION, -i ) + ) analysis_test( name = name, From 84439af2962ee1141ec7860495520cef59423e74 Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Mon, 12 Jan 2026 20:23:40 +0000 Subject: [PATCH 06/12] use common label --- tests/base_rules/py_executable_base_tests.bzl | 3 +-- tests/config_settings/transition/multi_version_tests.bzl | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/base_rules/py_executable_base_tests.bzl b/tests/base_rules/py_executable_base_tests.bzl index d5a4665365..5a1a446768 100644 --- a/tests/base_rules/py_executable_base_tests.bzl +++ b/tests/base_rules/py_executable_base_tests.bzl @@ -49,7 +49,6 @@ def _test_basic_windows(name, config): # platforms. # Pass value to both native and starlark versions of the flag until # the native one is removed. - "//command_line_option:build_python_zip": "true", labels.BUILD_PYTHON_ZIP: True, "//command_line_option:cpu": "windows_x86_64", "//command_line_option:crosstool_top": CROSSTOOL_TOP, @@ -95,7 +94,7 @@ def _test_basic_zip(name, config): # platforms. # Pass value to both native and starlark versions of the flag until # the native one is removed. - "//python/config_settings:build_python_zip": "true", + "@rules_python//python/config_settings:build_python_zip": "true", labels.BUILD_PYTHON_ZIP: True, "//command_line_option:cpu": "linux_x86_64", "//command_line_option:crosstool_top": CROSSTOOL_TOP, diff --git a/tests/config_settings/transition/multi_version_tests.bzl b/tests/config_settings/transition/multi_version_tests.bzl index b9b8a6b482..dee2aac554 100644 --- a/tests/config_settings/transition/multi_version_tests.bzl +++ b/tests/config_settings/transition/multi_version_tests.bzl @@ -92,7 +92,6 @@ def _setup_py_binary_windows(name, *, impl, build_python_zip): target = name + "_subject", impl = impl, config_settings = { - "//python/config_settings:build_python_zip": str(build_python_zip), labels.BUILD_PYTHON_ZIP: build_python_zip, "//command_line_option:extra_toolchains": CC_TOOLCHAIN, "//command_line_option:platforms": str(platform_targets.WINDOWS_X86_64), From 3c53c5214a86f0b6ca7f09598520f358c6bb7051 Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Mon, 12 Jan 2026 20:29:40 +0000 Subject: [PATCH 07/12] remove incorrect label --- tests/base_rules/py_executable_base_tests.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/base_rules/py_executable_base_tests.bzl b/tests/base_rules/py_executable_base_tests.bzl index 5a1a446768..ed49bab2e4 100644 --- a/tests/base_rules/py_executable_base_tests.bzl +++ b/tests/base_rules/py_executable_base_tests.bzl @@ -94,7 +94,6 @@ def _test_basic_zip(name, config): # platforms. # Pass value to both native and starlark versions of the flag until # the native one is removed. - "@rules_python//python/config_settings:build_python_zip": "true", labels.BUILD_PYTHON_ZIP: True, "//command_line_option:cpu": "linux_x86_64", "//command_line_option:crosstool_top": CROSSTOOL_TOP, From 0dbccff7e8ac159860633fd81651103d56e66c9e Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Tue, 13 Jan 2026 21:38:46 +0000 Subject: [PATCH 08/12] update bazel version to 7.7.0 --- MODULE.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 6026b02270..5b41a4632e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -356,7 +356,7 @@ bazel_binaries.local( name = "self", path = "tests/integration/bazel_from_env", ) -bazel_binaries.download(version = "7.4.1") +bazel_binaries.download(version = "7.7.0") bazel_binaries.download(version = "8.0.0") bazel_binaries.download(version = "9.0.0rc1") use_repo( @@ -365,7 +365,7 @@ use_repo( # These don't appear necessary, but are reported as direct dependencies # that should be use_repo()'d, so we add them as requested "bazel_binaries_bazelisk", - "build_bazel_bazel_7_4_1", + "build_bazel_bazel_7_7_0", "build_bazel_bazel_8_0_0", "build_bazel_bazel_9_0_0rc1", # "build_bazel_bazel_rolling", From 0c7134c4ff361b87fa2d3053df96045d502c0283 Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Wed, 14 Jan 2026 17:49:56 +0000 Subject: [PATCH 09/12] fix --- MODULE.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/MODULE.bazel b/MODULE.bazel index 5b41a4632e..16e9520286 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -356,6 +356,7 @@ bazel_binaries.local( name = "self", path = "tests/integration/bazel_from_env", ) + bazel_binaries.download(version = "7.7.0") bazel_binaries.download(version = "8.0.0") bazel_binaries.download(version = "9.0.0rc1") From 7106a6bba9f17b2c0702d2f4f380239355f48579 Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Wed, 14 Jan 2026 18:06:36 +0000 Subject: [PATCH 10/12] update bazel version to 8.5.1 where flag_alias is backported as no-op --- MODULE.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 16e9520286..ecc6b44867 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -358,7 +358,7 @@ bazel_binaries.local( ) bazel_binaries.download(version = "7.7.0") -bazel_binaries.download(version = "8.0.0") +bazel_binaries.download(version = "8.5.1") bazel_binaries.download(version = "9.0.0rc1") use_repo( bazel_binaries, @@ -367,7 +367,7 @@ use_repo( # that should be use_repo()'d, so we add them as requested "bazel_binaries_bazelisk", "build_bazel_bazel_7_7_0", - "build_bazel_bazel_8_0_0", + "build_bazel_bazel_8_5_1", "build_bazel_bazel_9_0_0rc1", # "build_bazel_bazel_rolling", "build_bazel_bazel_self", From e630cb88857fcbf905d0a94a1343c7ae85d00e14 Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Wed, 14 Jan 2026 18:36:50 +0000 Subject: [PATCH 11/12] add back the native flag reference as that is needed --- tests/base_rules/py_executable_base_tests.bzl | 1 + tests/config_settings/transition/multi_version_tests.bzl | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/base_rules/py_executable_base_tests.bzl b/tests/base_rules/py_executable_base_tests.bzl index ed49bab2e4..e1bb9ae1c0 100644 --- a/tests/base_rules/py_executable_base_tests.bzl +++ b/tests/base_rules/py_executable_base_tests.bzl @@ -94,6 +94,7 @@ def _test_basic_zip(name, config): # platforms. # Pass value to both native and starlark versions of the flag until # the native one is removed. + "//command_line_option:build_python_zip": "true", labels.BUILD_PYTHON_ZIP: True, "//command_line_option:cpu": "linux_x86_64", "//command_line_option:crosstool_top": CROSSTOOL_TOP, diff --git a/tests/config_settings/transition/multi_version_tests.bzl b/tests/config_settings/transition/multi_version_tests.bzl index dee2aac554..38a908e76c 100644 --- a/tests/config_settings/transition/multi_version_tests.bzl +++ b/tests/config_settings/transition/multi_version_tests.bzl @@ -92,6 +92,7 @@ def _setup_py_binary_windows(name, *, impl, build_python_zip): target = name + "_subject", impl = impl, config_settings = { + "//command_line_option:build_python_zip": "true", labels.BUILD_PYTHON_ZIP: build_python_zip, "//command_line_option:extra_toolchains": CC_TOOLCHAIN, "//command_line_option:platforms": str(platform_targets.WINDOWS_X86_64), From 25895ab467ee6fdedb4548d2745a1ea13f02f824 Mon Sep 17 00:00:00 2001 From: Ara Nguyen Date: Wed, 14 Jan 2026 18:44:46 +0000 Subject: [PATCH 12/12] add the correct flags --- tests/base_rules/py_executable_base_tests.bzl | 1 + tests/config_settings/transition/multi_version_tests.bzl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/base_rules/py_executable_base_tests.bzl b/tests/base_rules/py_executable_base_tests.bzl index e1bb9ae1c0..2af5406ced 100644 --- a/tests/base_rules/py_executable_base_tests.bzl +++ b/tests/base_rules/py_executable_base_tests.bzl @@ -49,6 +49,7 @@ def _test_basic_windows(name, config): # platforms. # Pass value to both native and starlark versions of the flag until # the native one is removed. + "//command_line_option:build_python_zip": "true", labels.BUILD_PYTHON_ZIP: True, "//command_line_option:cpu": "windows_x86_64", "//command_line_option:crosstool_top": CROSSTOOL_TOP, diff --git a/tests/config_settings/transition/multi_version_tests.bzl b/tests/config_settings/transition/multi_version_tests.bzl index 38a908e76c..05f010562c 100644 --- a/tests/config_settings/transition/multi_version_tests.bzl +++ b/tests/config_settings/transition/multi_version_tests.bzl @@ -92,7 +92,7 @@ def _setup_py_binary_windows(name, *, impl, build_python_zip): target = name + "_subject", impl = impl, config_settings = { - "//command_line_option:build_python_zip": "true", + "//command_line_option:build_python_zip": str(build_python_zip), labels.BUILD_PYTHON_ZIP: build_python_zip, "//command_line_option:extra_toolchains": CC_TOOLCHAIN, "//command_line_option:platforms": str(platform_targets.WINDOWS_X86_64),