more cleanup

Author: rickeylev

.bazelrc

@@ -4,8 +4,8 @@
 # (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
 # To update these lines, execute
 # `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
-build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma
-query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma
+build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,examples/scratch,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma
+query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,examples/scratch,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma
 
 test --test_output=errors
 

python/config_settings/BUILD.bazel

@@ -221,20 +221,12 @@ define_pypi_internal_flags(
     name = "define_pypi_internal_flags",
 )
 
-# todo: have single --pypi_env_config flag instead? Under the hood, it
-# could be driven more more discrete flags, which could be considered an
-# implementation detail of our particular impl.
-# A label is used to allow users to use select() to affect the value.
-# A target providing BuildSettingInfo is used to allow users to define
-# a flag as the target, which lets them CLI-override or transition it easily.
 label_flag(
     name = "pip_platform_release_config",
     build_setting_default = ":_pip_platform_release_default_config",
     visibility = ["//visibility:public"],
 )
 
-# docs: points to a label that provides BuildSettingInfo for the value.
-# A label and BuildSettingInfo are used for the same reason as platform_release
 label_flag(
     name = "pip_platform_version_config",
     build_setting_default = ":_pip_platform_version_default_config",

python/private/pypi/env_marker_setting.bzl

@@ -6,7 +6,6 @@ load(
     ":pep508_env.bzl",
     "env_aliases",
     "os_name_select_map",
-    "platform_machine_aliases",
     "platform_machine_select_map",
     "platform_system_select_map",
     "sys_platform_select_map",
@@ -47,10 +46,7 @@ def env_marker_setting(*, name, expression, **kwargs):
         **kwargs
     )
 
-# todo: maybe put all the env into a single target and have a
-# PyPiEnvMarkersInfo provider? Have --pypi_env=//some:target?
 def _env_marker_setting_impl(ctx):
-    # todo: should unify with pep508_env.bzl
     env = {}
 
     runtime = ctx.toolchains[TARGET_TOOLCHAIN_TYPE].py3_runtime
@@ -65,7 +61,7 @@ def _env_marker_setting_impl(ctx):
         env["implementation_version"] = full_version
     else:
         env["python_version"] = _get_flag(ctx.attr._python_version_major_minor_flag)
-        full_version = _get_flag(ctx.attr._python_full_version)
+        full_version = _get_flag(ctx.attr._python_full_version_flag)
         env["python_full_version"] = full_version
         env["implementation_version"] = full_version
 

python/private/pypi/flags.bzl

@@ -91,10 +91,6 @@ def define_pypi_internal_flags(name):
     )
     _platform_version_config(
         name = "_pip_platform_version_default_config",
-        value = select({
-            "@platforms//os:osx": "USE_OSX_VERSION_FLAG",
-            "//conditions:default": "",
-        }),
         visibility = ["//visibility:public"],
     )
 
@@ -134,14 +130,10 @@ _platform_release_config = rule(
 )
 
 def _platform_version_config_impl(ctx):
-    value = ctx.attr.value
-    return [BuildSettingInfo(value = ctx.attr.value)]
+    return [BuildSettingInfo(value = "")]
 
 # Despite its name, this "version" value is not a simple version value.
 # It's a more detailed, arbitrary, description the OS gives about itself.
 _platform_version_config = rule(
     implementation = _platform_version_config_impl,
-    attrs = {
-        "value": attr.string(),
-    },
 )

python/private/pypi/pep508_env.bzl

@@ -124,17 +124,17 @@ sys_platform_select_map = {
     # These values are decided by the sys.platform docs.
     "@platforms//os:android": "android",
     "@platforms//os:emscripten": "emscripten",
-    "@platforms//os:ios": "ios",
-    "@platforms//os:linux": "linux",
-    "@platforms//os:osx": "darwin",
-    "@platforms//os:windows": "win32",
-    "@platforms//os:wasi": "wasi",
     # NOTE: The below values are approximations. The sys.platform() docs
     # don't have documented values for these OSes. Per docs, the
     # sys.platform() value reflects the OS at the time Python was *built*
     # instead of the runtime (target) OS value.
     "@platforms//os:freebsd": "freebsd",
+    "@platforms//os:ios": "ios",
+    "@platforms//os:linux": "linux",
     "@platforms//os:openbsd": "openbsd",
+    "@platforms//os:osx": "darwin",
+    "@platforms//os:wasi": "wasi",
+    "@platforms//os:windows": "win32",
     # For lack of a better option, use empty string. No standard doc/spec
     # about sys_platform value.
     "//conditions:default": "",

tests/pypi/env_marker_setting/env_marker_setting_tests.bzl

@@ -2,15 +2,12 @@ load("@rules_testing//lib:analysis_test.bzl", "analysis_test")
 load("@rules_testing//lib:test_suite.bzl", "test_suite")
 load("@rules_testing//lib:util.bzl", "TestingAspectInfo")
 load("//python/private/pypi:env_marker_setting.bzl", "env_marker_setting")
-load("//python/private/pypi:pep508_env.bzl", pep508_env = "env")  # buildifier: disable=bzl-visibility
-load("//python/private/pypi:pep508_evaluate.bzl", "evaluate", "tokenize")  # buildifier: disable=bzl-visibility
 load("//tests/support:support.bzl", "PYTHON_VERSION")
 
 _tests = []
 
 def _test_expr(name):
     def impl(env, target):
-        # todo: create FeatureFlagInfo subject
         env.expect.where(
             expression = target[TestingAspectInfo].attrs.expression,
         ).that_str(
@@ -20,19 +17,19 @@ def _test_expr(name):
         )
 
     cases = {
-        "python_version_gte": {
-            "expression": "python_version >= '3.12.0'",
-            "expected": "TRUE",
+        "python_full_version_lt_negative": {
             "config_settings": {
                 PYTHON_VERSION: "3.12.0",
             },
-        },
-        "python_full_version_lt_negative": {
-            "expression": "python_full_version < '3.8'",
             "expected": "FALSE",
+            "expression": "python_full_version < '3.8'",
+        },
+        "python_version_gte": {
             "config_settings": {
                 PYTHON_VERSION: "3.12.0",
             },
+            "expected": "TRUE",
+            "expression": "python_version >= '3.12.0'",
         },
     }