Skip to content

Commit 5316f2a

Browse files
committed
remove platform_version and platform_release flags for now
1 parent ba05d71 commit 5316f2a

File tree

3 files changed

+9
-63
lines changed

3 files changed

+9
-63
lines changed

python/config_settings/BUILD.bazel

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,3 @@ string_flag(
220220
define_pypi_internal_flags(
221221
name = "define_pypi_internal_flags",
222222
)
223-
224-
label_flag(
225-
name = "pip_platform_release_config",
226-
build_setting_default = ":_pip_platform_release_default_config",
227-
visibility = ["//visibility:public"],
228-
)
229-
230-
label_flag(
231-
name = "pip_platform_version_config",
232-
build_setting_default = ":_pip_platform_version_default_config",
233-
visibility = ["//visibility:public"],
234-
)

python/private/pypi/env_marker_setting.bzl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ def env_marker_setting(*, name, expression, **kwargs):
4343
sys_platform = select(sys_platform_select_map),
4444
platform_machine = select(platform_machine_select_map),
4545
platform_system = select(platform_system_select_map),
46+
platform_release = select({
47+
"@platforms//os:osx": "USE_OSX_VERSION_FLAG",
48+
"//conditions:default": "",
49+
}),
4650
**kwargs
4751
)
4852

@@ -90,9 +94,11 @@ def _env_marker_setting_impl(ctx):
9094
# https://peps.python.org/pep-0738/#platform
9195
# Similar for iOS:
9296
# https://peps.python.org/pep-0730/#platform
93-
env["platform_release"] = _get_flag(ctx.attr._platform_release_config_flag)
97+
env["platform_release"] = ctx.attr.platform_release
9498
env["platform_system"] = ctx.attr.platform_system
95-
env["platform_version"] = _get_flag(ctx.attr._platform_version_config_flag)
99+
100+
# For lack of a better option, just use an empty string for now.
101+
env["platform_version"] = ""
96102

97103
env.update(env_aliases())
98104

@@ -118,16 +124,9 @@ for the specification of behavior.
118124
),
119125
"os_name": attr.string(),
120126
"platform_machine": attr.string(),
127+
"platform_release": attr.string(),
121128
"platform_system": attr.string(),
122129
"sys_platform": attr.string(),
123-
"_platform_release_config_flag": attr.label(
124-
default = "//python/config_settings:pip_platform_release_config",
125-
providers = [[config_common.FeatureFlagInfo], [BuildSettingInfo]],
126-
),
127-
"_platform_version_config_flag": attr.label(
128-
default = "//python/config_settings:pip_platform_version_config",
129-
providers = [[config_common.FeatureFlagInfo], [BuildSettingInfo]],
130-
),
131130
"_python_full_version_flag": attr.label(
132131
default = "//python/config_settings:python_version",
133132
providers = [config_common.FeatureFlagInfo],

python/private/pypi/flags.bzl

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,6 @@ def define_pypi_internal_flags(name):
8181
name = "_internal_pip_whl",
8282
visibility = ["//visibility:public"],
8383
)
84-
_platform_release_config(
85-
name = "_pip_platform_release_default_config",
86-
value = select({
87-
"@platforms//os:osx": "USE_OSX_VERSION_FLAG",
88-
"//conditions:default": "",
89-
}),
90-
visibility = ["//visibility:public"],
91-
)
92-
_platform_version_config(
93-
name = "_pip_platform_version_default_config",
94-
visibility = ["//visibility:public"],
95-
)
9684

9785
def _allow_wheels_flag_impl(ctx):
9886
input = ctx.attr._setting[BuildSettingInfo].value
@@ -109,32 +97,3 @@ This rule allows us to greatly reduce the number of config setting targets at no
10997
if we are duplicating some of the functionality of the `native.config_setting`.
11098
""",
11199
)
112-
113-
def _platform_release_config_impl(ctx):
114-
value = ctx.attr.value
115-
if value == "USE_OSX_VERSION_FLAG":
116-
value = ctx.attr._osx_version[BuildSettingInfo].value
117-
118-
return [BuildSettingInfo(value = ctx.attr.value)]
119-
120-
# This value is loosely some version-value looking thing, but the format
121-
# varies depending on the OS.
122-
_platform_release_config = rule(
123-
implementation = _platform_release_config_impl,
124-
attrs = {
125-
"value": attr.string(),
126-
"_osx_version": attr.label(
127-
default = "//python/config_settings:pip_whl_osx_version",
128-
),
129-
},
130-
)
131-
132-
def _platform_version_config_impl(ctx):
133-
_ = ctx # @unused
134-
return [BuildSettingInfo(value = "")]
135-
136-
# Despite its name, this "version" value is not a simple version value.
137-
# It's a more detailed, arbitrary, description the OS gives about itself.
138-
_platform_version_config = rule(
139-
implementation = _platform_version_config_impl,
140-
)

0 commit comments

Comments
 (0)