use a single dict attribute

Author: aignas

python/private/pypi/extension.bzl

@@ -372,22 +372,22 @@ def _whl_repo(*, src, whl_library_args, is_multiple_versions, download_only, net
         ),
     )
 
-def _configure(config, *, platform, os_name, arch_name, override = False, **values):
+def _configure(config, *, platform, os_name, arch_name, override = False, env = {}):
     """Set the value in the config if the value is provided"""
     config.setdefault("platforms", {})
     if platform:
         if not override and config.get("platforms", {}).get(platform):
             return
 
+        for key in env:
+            if key not in _SUPPORTED_PEP508_KEYS:
+                fail("Unsupported key in the PEP508 environment: {}".format(key))
+
         config["platforms"][platform] = struct(
             name = platform.replace("-", "_").lower(),
             os_name = os_name,
             arch_name = arch_name,
-            env = {
-                k[4:]: v
-                for k, v in values.items()
-                if k.startswith("env_") and v
-            },
+            env = env,
         )
     else:
         config["platforms"].pop(platform)
@@ -411,9 +411,9 @@ def _create_config(defaults):
         _configure(
             defaults,
             arch_name = cpu,
-            env_platform_version = "0",
             os_name = "linux",
             platform = "linux_{}".format(cpu),
+            env = {"platform_version": "0"},
         )
     for cpu in [
         "aarch64",
@@ -424,15 +424,15 @@ def _create_config(defaults):
             arch_name = cpu,
             # We choose the oldest non-EOL version at the time when we release `rules_python`.
             # See https://endoflife.date/macos
-            env_platform_version = "14.0",
+            env = {"platform_version": "14.0"},
             os_name = "osx",
             platform = "osx_{}".format(cpu),
         )
 
     _configure(
         defaults,
         arch_name = "x86_64",
-        env_platform_version = "0",
+        env = {"platform_version": "0"},
         os_name = "windows",
         platform = "windows_x86_64",
     )
@@ -500,14 +500,7 @@ You cannot use both the additive_build_content and additive_build_content_file a
             _configure(
                 defaults,
                 arch_name = tag.arch_name,
-                # The env_ values is only used if the `PIPSTAR` is enabled
-                env_implementation_name = tag.env_implementation_name,
-                env_os_name = tag.env_os_name,
-                env_platform_machine = tag.env_platform_machine,
-                env_platform_release = tag.env_platform_release,
-                env_platform_system = tag.env_platform_system,
-                env_platform_version = tag.env_platform_version,
-                env_sys_platform = tag.env_sys_platform,
+                env = tag.env,
                 os_name = tag.os_name,
                 platform = tag.platform,
                 override = mod.is_root,
@@ -791,7 +784,7 @@ _default_attrs = {
 The CPU architecture name to be used.
 
 :::{note}
-Either this or {attr}`env_platform_machine` should be specified.
+Either this or {attr}`env` `platform_machine` key should be specified.
 :::
 """,
     ),
@@ -800,7 +793,7 @@ Either this or {attr}`env_platform_machine` should be specified.
 The OS name to be used.
 
 :::{note}
-Either this or the appropriate `env_*` attributes should be specified.
+Either this or the appropriate `env` keys should be specified.
 :::
 """,
     ),
@@ -814,30 +807,37 @@ If you are defining custom platforms in your project and don't want things to cl
 """,
     ),
 } | {
-    # The values for PEP508 env marker evaluation during the lock file parsing
-    "env_implementation_name": attr.string(
-        doc = "Value for `implementation_name` to evaluate environment markers. Defaults to `cpython`.",
-    ),
-    "env_os_name": attr.string(
-        doc = "Value for `os_name` to evaluate environment markers. Defaults to a value inferred from the {attr}`os_name`.",
-    ),
-    "env_platform_machine": attr.string(
-        doc = "Value for `platform_machine` to evaluate environment markers. Defaults to a value inferred from the {attr}`arch_name`.",
-    ),
-    "env_platform_release": attr.string(
-        doc = "Value for `platform_machine` to evaluate environment markers. Defaults to an empty value.",
-    ),
-    "env_platform_system": attr.string(
-        doc = "Value for `platform_system` to evaluate environment markers. Defaults to a value inferred from the {attr}`os_name`.",
-    ),
-    "env_platform_version": attr.string(
-        doc = "Value for `platform_machine` to evaluate environment markers. Defaults to `0`.",
-    ),
-    "env_sys_platform": attr.string(
-        doc = "Value for `sys_platform` to evaluate environment markers. Defaults to a value inferred from the {attr}`os_name`.",
+    "env": attr.string_dict(
+        doc = """\
+Values for the PEP508 environment marker evaluation during lock file parsing.
+
+Supported keys:
+* `implementation_name`, defaults to `cpython`.
+* `os_name`, defaults to a value inferred from the {attr}`os_name`.
+* `platform_machine`, defaults to a value inferred from the {attr}`arch_name`.
+* `platform_release`, defaults to an empty value.
+* `platform_system`, defaults to a value inferred from the {attr}`os_name`.
+* `platform_version`, defaults to `0`.
+* `sys_platform`, defaults to a value inferred from the {attr}`os_name`.
+
+::::{note}
+This is only used if the {envvar}`RULES_PYTHON_ENABLE_PIPSTAR` is enabled.
+::::
+""",
     ),
+    # The values for PEP508 env marker evaluation during the lock file parsing
 }
 
+_SUPPORTED_PEP508_KEYS = [
+    "implementation_name",
+    "os_name",
+    "platform_machine",
+    "platform_release",
+    "platform_system",
+    "platform_version",
+    "sys_platform",
+]
+
 def _pip_parse_ext_attrs(**kwargs):
     """Get the attributes for the pip extension.
 

tests/pypi/extension/extension_tests.bzl

@@ -82,13 +82,7 @@ def _default(
         os_name = None,
         platform = None,
         target_settings = None,
-        env_implementation_name = None,
-        env_os_name = None,
-        env_platform_machine = None,
-        env_platform_release = None,
-        env_platform_system = None,
-        env_platform_version = None,
-        env_sys_platform = None,
+        env = None,
         whl_limit = None,
         whl_platforms = None):
     return struct(
@@ -97,13 +91,7 @@ def _default(
         os_name = os_name,
         platform = platform,
         target_settings = target_settings,
-        env_implementation_name = env_implementation_name,
-        env_os_name = env_os_name,
-        env_platform_machine = env_platform_machine,
-        env_platform_release = env_platform_release,
-        env_platform_system = env_platform_system,
-        env_platform_version = env_platform_version,
-        env_sys_platform = env_sys_platform,
+        env = env or {},
         whl_platforms = whl_platforms,
         whl_limit = whl_limit,
     )