chore(pypi): remove unused config settings code

Author: aignas

MODULE.bazel

@@ -76,6 +76,7 @@ pip = use_extension("//python/extensions:pip.bzl", "pip")
             "//python/config_settings:_is_py_freethreaded_{}".format(
                 "yes" if freethreaded else "no",
             ),
+            "//python/config_settings:_is_py_linux_libc_glibc",
         ],
         env = {"platform_version": "0"},
         marker = "python_version >= '3.13'" if freethreaded else "",

docs/api/rules_python/python/config_settings/index.md

@@ -274,60 +274,6 @@ the values used when environment markers are resolved at build time.
 :::
 ::::
 
-::::{bzl:flag} pip_whl
-Set what distributions are used in the `pip` integration.
-
-Values:
-* `auto`: Prefer `whl` distributions if they are compatible with a target
-  platform, but fallback to `sdist`. This is the default.
-* `only`: Only use `whl` distributions and error out if it is not available.
-* `no`: Only use `sdist` distributions. The wheels will be built non-hermetically in the `whl_library` repository rule.
-:::{versionadded} 0.33.0
-:::
-::::
-
-::::{bzl:flag} pip_whl_osx_arch
-Set what wheel types we should prefer when building on the OSX platform.
-
-Values:
-* `arch`: Prefer architecture specific wheels.
-* `universal`: Prefer universal wheels that usually are bigger and contain binaries for both, Intel and ARM architectures in the same wheel.
-:::{versionadded} 0.33.0
-:::
-::::
-
-::::{bzl:flag} pip_whl_glibc_version
-Set the minimum `glibc` version that the `py_binary` using `whl` distributions from a PyPI index should support.
-
-Values:
-* `""`: Select the lowest available version of each wheel giving you the maximum compatibility. This is the default.
-* `X.Y`: The string representation of a `glibc` version. The allowed values depend on the `requirements.txt` lock file contents.
-:::{versionadded} 0.33.0
-:::
-::::
-
-::::{bzl:flag} pip_whl_muslc_version
-Set the minimum `muslc` version that the `py_binary` using `whl` distributions from a PyPI index should support.
-
-Values:
-* `""`: Select the lowest available version of each wheel giving you the maximum compatibility. This is the default.
-* `X.Y`: The string representation of a `muslc` version. The allowed values depend on the `requirements.txt` lock file contents.
-:::{versionadded} 0.33.0
-:::
-::::
-
-::::{bzl:flag} pip_whl_osx_version
-Set the minimum `osx` version that the `py_binary` using `whl` distributions from a PyPI index should support.
-
-Values:
-* `""`: Select the lowest available version of each wheel giving you the maximum compatibility. This is the default.
-* `X.Y`: The string representation of the MacOS version. The allowed values depend on the `requirements.txt` lock file contents.
-
-:::{versionadded} 0.33.0
-:::
-::::
-
-
 ::::
 
 :::{flag} venvs_site_packages

docs/pypi/download.md

@@ -244,11 +244,6 @@ that by parsing the `whl` filename based on [PEP600], [PEP656] standards. This
 allows the user to configure the behaviour by using the following publicly
 available flags:
 * {obj}`--@rules_python//python/config_settings:py_linux_libc` for selecting the Linux libc variant.
-* {obj}`--@rules_python//python/config_settings:pip_whl` for selecting `whl` distribution preference.
-* {obj}`--@rules_python//python/config_settings:pip_whl_osx_arch` for selecting MacOS wheel preference.
-* {obj}`--@rules_python//python/config_settings:pip_whl_glibc_version` for selecting the GLIBC version compatibility.
-* {obj}`--@rules_python//python/config_settings:pip_whl_muslc_version` for selecting the musl version compatibility.
-* {obj}`--@rules_python//python/config_settings:pip_whl_osx_version` for selecting MacOS version compatibility.
 
 [bazel_downloader]: https://bazel.build/rules/lib/builtins/repository_ctx#download
 [pep600]: https://peps.python.org/pep-0600/

python/config_settings/BUILD.bazel

@@ -14,12 +14,7 @@ load(
     "VenvsUseDeclareSymlinkFlag",
     rp_string_flag = "string_flag",
 )
-load(
-    "//python/private/pypi:flags.bzl",
-    "UniversalWhlFlag",
-    "UseWhlFlag",
-    "define_pypi_internal_flags",
-)
+load("//python/private/pypi:flags.bzl", "define_pypi_internal_flags")
 load(":config_settings.bzl", "construct_config_settings")
 
 filegroup(
@@ -34,11 +29,6 @@ construct_config_settings(
     name = "construct_config_settings",
     default_version = DEFAULT_PYTHON_VERSION,
     documented_flags = [
-        ":pip_whl",
-        ":pip_whl_glibc_version",
-        ":pip_whl_muslc_version",
-        ":pip_whl_osx_arch",
-        ":pip_whl_osx_version",
         ":py_freethreaded",
         ":py_linux_libc",
     ],
@@ -157,70 +147,6 @@ string_flag(
 
 # pip.parse related flags
 
-string_flag(
-    name = "pip_whl",
-    build_setting_default = UseWhlFlag.AUTO,
-    values = sorted(UseWhlFlag.__members__.values()),
-    # NOTE: Only public because it is used in pip hub repos.
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "is_pip_whl_auto",
-    flag_values = {
-        ":pip_whl": UseWhlFlag.AUTO,
-    },
-    # NOTE: Only public because it is used in pip hub repos.
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "is_pip_whl_no",
-    flag_values = {
-        ":pip_whl": UseWhlFlag.NO,
-    },
-    # NOTE: Only public because it is used in pip hub repos.
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "is_pip_whl_only",
-    flag_values = {
-        ":pip_whl": UseWhlFlag.ONLY,
-    },
-    # NOTE: Only public because it is used in pip hub repos.
-    visibility = ["//visibility:public"],
-)
-
-string_flag(
-    name = "pip_whl_osx_arch",
-    build_setting_default = UniversalWhlFlag.ARCH,
-    values = sorted(UniversalWhlFlag.__members__.values()),
-    # NOTE: Only public because it is used in pip hub repos.
-    visibility = ["//visibility:public"],
-)
-
-string_flag(
-    name = "pip_whl_glibc_version",
-    build_setting_default = "",
-    # NOTE: Only public because it is used in pip hub repos.
-    visibility = ["//visibility:public"],
-)
-
-string_flag(
-    name = "pip_whl_muslc_version",
-    build_setting_default = "",
-    # NOTE: Only public because it is used in pip hub repos.
-    visibility = ["//visibility:public"],
-)
-
-string_flag(
-    name = "pip_whl_osx_version",
-    build_setting_default = "",
-    # NOTE: Only public because it is used in pip hub repos.
-    visibility = ["//visibility:public"],
-)
-
 string_flag(
     name = "venvs_site_packages",
     build_setting_default = VenvsSitePackages.NO,

python/private/common_labels.bzl

@@ -16,11 +16,6 @@ labels = struct(
     EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain")),
     NONE = str(Label("//python:none")),
     PIP_ENV_MARKER_CONFIG = str(Label("//python/config_settings:pip_env_marker_config")),
-    PIP_WHL = str(Label("//python/config_settings:pip_whl")),
-    PIP_WHL_GLIBC_VERSION = str(Label("//python/config_settings:pip_whl_glibc_version")),
-    PIP_WHL_MUSLC_VERSION = str(Label("//python/config_settings:pip_whl_muslc_version")),
-    PIP_WHL_OSX_ARCH = str(Label("//python/config_settings:pip_whl_osx_arch")),
-    PIP_WHL_OSX_VERSION = str(Label("//python/config_settings:pip_whl_osx_version")),
     PLATFORMS_OS_WINDOWS = str(Label("@platforms//os:windows")),
     PRECOMPILE = str(Label("//python/config_settings:precompile")),
     PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention")),

python/private/pypi/BUILD.bazel

@@ -145,7 +145,6 @@ bzl_library(
     deps = [
         ":env_marker_info.bzl",
         ":pep508_env_bzl",
-        "//python/private:enum_bzl",
         "@bazel_skylib//rules:common_settings",
     ],
 )

python/private/pypi/flags.bzl

@@ -18,9 +18,8 @@ NOTE: The transitive loads of this should be kept minimal. This avoids loading
 unnecessary files when all that are needed are flag definitions.
 """
 
-load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo", "string_flag")
+load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("//python/private:common_labels.bzl", "labels")
-load("//python/private:enum.bzl", "enum")
 load(":env_marker_info.bzl", "EnvMarkerInfo")
 load(
     ":pep508_env.bzl",
@@ -31,87 +30,16 @@ load(
     "sys_platform_select_map",
 )
 
-# Determines if we should use whls for third party
-#
-# buildifier: disable=name-conventions
-UseWhlFlag = enum(
-    # Automatically decide the effective value based on environment, target
-    # platform and the presence of distributions for a particular package.
-    AUTO = "auto",
-    # Do not use `sdist` and fail if there are no available whls suitable for the target platform.
-    ONLY = "only",
-    # Do not use whl distributions and instead build the whls from `sdist`.
-    NO = "no",
-)
-
-# Determines whether universal wheels should be preferred over arch platform specific ones.
-#
-# buildifier: disable=name-conventions
-UniversalWhlFlag = enum(
-    # Prefer platform-specific wheels over universal wheels.
-    ARCH = "arch",
-    # Prefer universal wheels over platform-specific wheels.
-    UNIVERSAL = "universal",
-)
-
-_STRING_FLAGS = [
-    "dist",
-    "whl_plat",
-    "whl_plat_py3",
-    "whl_plat_py3_abi3",
-    "whl_plat_pycp3x",
-    "whl_plat_pycp3x_abi3",
-    "whl_plat_pycp3x_abicp",
-    "whl_py3",
-    "whl_py3_abi3",
-    "whl_pycp3x",
-    "whl_pycp3x_abi3",
-    "whl_pycp3x_abicp",
-]
-
-INTERNAL_FLAGS = [
-    "whl",
-] + _STRING_FLAGS
-
 def define_pypi_internal_flags(name):
     """define internal PyPI flags used in PyPI hub repository by pkg_aliases.
 
     Args:
         name: not used
     """
-    for flag in _STRING_FLAGS:
-        string_flag(
-            name = "_internal_pip_" + flag,
-            build_setting_default = "",
-            values = [""],
-            visibility = ["//visibility:public"],
-        )
-
-    _allow_wheels_flag(
-        name = "_internal_pip_whl",
-        visibility = ["//visibility:public"],
-    )
-
     _default_env_marker_config(
         name = "_pip_env_marker_default_config",
     )
 
-def _allow_wheels_flag_impl(ctx):
-    input = ctx.attr._setting[BuildSettingInfo].value
-    value = "yes" if input in ["auto", "only"] else "no"
-    return [config_common.FeatureFlagInfo(value = value)]
-
-_allow_wheels_flag = rule(
-    implementation = _allow_wheels_flag_impl,
-    attrs = {
-        "_setting": attr.label(default = labels.PIP_WHL),
-    },
-    doc = """
-This rule allows us to greatly reduce the number of config setting targets at no cost even
-if we are duplicating some of the functionality of the `native.config_setting`.
-""",
-)
-
 def _default_env_marker_config(**kwargs):
     _env_marker_config(
         os_name = select(os_name_select_map),

python/private/pypi/hub_builder.bzl

@@ -7,7 +7,7 @@ load("//python/private:text_util.bzl", "render")
 load("//python/private:version.bzl", "version")
 load("//python/private:version_label.bzl", "version_label")
 load(":attrs.bzl", "use_isolated")
-load(":evaluate_markers.bzl", evaluate_markers_star = "evaluate_markers")
+load(":evaluate_markers.bzl", "evaluate_markers")
 load(":parse_requirements.bzl", "parse_requirements")
 load(":pep508_env.bzl", "env")
 load(":pep508_evaluate.bzl", "evaluate")
@@ -469,7 +469,7 @@ def _evaluate_markers(self, pip_attr):
     if self._evaluate_markers_fn:
         return self._evaluate_markers_fn
 
-    return lambda _, requirements: evaluate_markers_star(
+    return lambda requirements: evaluate_markers(
         requirements = requirements,
         platforms = self._platforms[pip_attr.python_version],
     )

tests/pypi/config_settings/config_settings_tests.bzl

@@ -32,14 +32,7 @@ _subject = rule(
 
 _flag = struct(
     platform = lambda x: ("//command_line_option:platforms", str(Label("//tests/support/platforms:" + x))),
-    pip_whl = lambda x: (str(Label("//python/config_settings:pip_whl")), str(x)),
-    pip_whl_glibc_version = lambda x: (str(Label("//python/config_settings:pip_whl_glibc_version")), str(x)),
-    pip_whl_muslc_version = lambda x: (str(Label("//python/config_settings:pip_whl_muslc_version")), str(x)),
-    pip_whl_osx_version = lambda x: (str(Label("//python/config_settings:pip_whl_osx_version")), str(x)),
-    pip_whl_osx_arch = lambda x: (str(Label("//python/config_settings:pip_whl_osx_arch")), str(x)),
-    py_linux_libc = lambda x: (str(Label("//python/config_settings:py_linux_libc")), str(x)),
     python_version = lambda x: (str(Label("//python/config_settings:python_version")), str(x)),
-    py_freethreaded = lambda x: (str(Label("//python/config_settings:py_freethreaded")), str(x)),
 )
 
 def _analysis_test(*, name, dist, want, config_settings = [_flag.platform("linux_aarch64")]):