rename to env_marker_setting

Author: rickeylev

python/private/pypi/dependency_specifier_flag.bzl renamed to python/private/pypi/env_marker_setting.bzl

@@ -2,8 +2,8 @@ load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("//python/private:toolchain_types.bzl", "TARGET_TOOLCHAIN_TYPE")
 load(":pep508_evaluate.bzl", "evaluate")
 
-def depspec_flag(**kwargs):
-    pypa_dependency_specification(
+def env_marker_setting(**kwargs):
+    _env_marker_setting(
         # todo: copied from pep508_env.bzl
         os_name = select({
             # The "java" value is documented, but with Jython defunct,
@@ -88,12 +88,14 @@ def _impl(ctx):
     env["platform_version"] = ctx.attr._platform_version_config_flag[BuildSettingInfo].value
 
     if evaluate(ctx.attr.expression, env = env):
+        # todo: better return value than "yes" and "no"
+        # matched/unmatched, satisfied/unsatisfied ?
         value = "yes"
     else:
         value = "no"
     return [config_common.FeatureFlagInfo(value = value)]
 
-pypa_dependency_specification = rule(
+_env_marker_setting = rule(
     implementation = _impl,
     attrs = {
         "expression": attr.string(),
@@ -116,6 +118,7 @@ pypa_dependency_specification = rule(
         # todo: what to do with this?
         "_extra_flag": attr.label(),
     },
+    provides = [config_common.FeatureFlagInfo],
     toolchains = [
         TARGET_TOOLCHAIN_TYPE,
     ],

tests/pypi/env_marker_setting/BUILD.bazel

@@ -0,0 +1,5 @@
+load(":env_marker_setting_tests.bzl", "env_marker_setting_test_suite")
+
+env_marker_setting_test_suite(
+    name = "env_marker_setting_tests",
+)

tests/pypi/pep508/depspec_flag_tests.bzl renamed to tests/pypi/env_marker_setting/env_marker_setting_tests.bzl

@@ -1,7 +1,7 @@
 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:dependency_specifier_flag.bzl", "depspec_flag")
+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")
@@ -40,7 +40,7 @@ def _test_expr(name):
     for case_name, case in cases.items():
         test_name = name + "_" + case_name
         tests.append(test_name)
-        depspec_flag(
+        env_marker_setting(
             name = test_name + "_subject",
             expression = case["expression"],
         )
@@ -63,7 +63,7 @@ def _test_expr(name):
 
 _tests.append(_test_expr)
 
-def depspec_flag_test_suite(name):
+def env_marker_setting_test_suite(name):
     test_suite(
         name = name,
         tests = _tests,

tests/pypi/pep508/BUILD.bazel

@@ -1,5 +1,4 @@
 load(":deps_tests.bzl", "deps_test_suite")
-load(":depspec_flag_tests.bzl", "depspec_flag_test_suite")
 load(":evaluate_tests.bzl", "evaluate_test_suite")
 load(":requirement_tests.bzl", "requirement_test_suite")
 
@@ -14,8 +13,3 @@ evaluate_test_suite(
 requirement_test_suite(
     name = "requirement_tests",
 )
-
-# todo: move to subdir; it generates many test targets
-depspec_flag_test_suite(
-    name = "depspec_flag_tests",
-)