wip

Author: aignas

python/private/pypi/pep508_env.bzl

@@ -16,15 +16,6 @@
 """
 
 # See https://stackoverflow.com/questions/45125516/possible-values-for-uname-m
-_platform_machine_values = {
-    "aarch64": "aarch64",
-    "ppc": "ppc",
-    "ppc64le": "ppc64le",
-    "riscv64": "riscv64",
-    "s390x": "s390x",
-    "x86_32": "i386",
-    "x86_64": "x86_64",
-}
 _platform_system_values = {
     "linux": "Linux",
     "osx": "Darwin",
@@ -62,6 +53,9 @@ def env(target_platform, *, extra = None):
         "platform_release": "",
         "platform_version": "",
     }
+    if type(target_platform) == type(""):
+        target_platform = platform_from_str(target_platform, python_version = "")
+
     if target_platform.abi:
         minor_version, _, micro_version = target_platform.abi[3:].partition(".")
         micro_version = micro_version or "0"
@@ -72,10 +66,9 @@ def env(target_platform, *, extra = None):
         }
     if target_platform.os and target_platform.arch:
         os = target_platform.os
-        arch = target_platform.arch
         env = env | {
             "os_name": _os_name_values.get(os, ""),
-            "platform_machine": _platform_machine_values.get(arch, ""),
+            "platform_machine": target_platform.arch,
             "platform_system": _platform_system_values.get(os, ""),
             "sys_platform": _sys_platform_values.get(os, ""),
         }

tests/pypi/pep508/evaluate_tests.bzl

@@ -14,6 +14,7 @@
 """Tests for construction of Python version matching config settings."""
 
 load("@rules_testing//lib:test_suite.bzl", "test_suite")
+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
 
 _tests = []
@@ -234,6 +235,35 @@ def _evaluate_partial_only_extra(env):
 
 _tests.append(_evaluate_partial_only_extra)
 
+def _evaluate_with_aliases(env):
+    # When
+    for target_platform, tests in {
+        # buildifier: @unsorted-dict-items
+        "osx_aarch64": {
+            "platform_system == 'Darwin' and platform_machine == 'arm64'": True,
+            "platform_system == 'Darwin' and platform_machine == 'aarch64'": True,
+            "platform_system == 'Darwin' and platform_machine == 'amd64'": False,
+        },
+        "osx_x86_64": {
+            "platform_system == 'Darwin' and platform_machine == 'amd64'": True,
+            "platform_system == 'Darwin' and platform_machine == 'x86_64'": True,
+        },
+        "osx_x86_32": {
+            "platform_system == 'Darwin' and platform_machine == 'i386'": True,
+            "platform_system == 'Darwin' and platform_machine == 'i686'": True,
+            "platform_system == 'Darwin' and platform_machine == 'x86_32'": True,
+            "platform_system == 'Darwin' and platform_machine == 'x86_64'": False,
+        },
+    }.items():  # buildifier: @unsorted-dict-items
+        for input, want in tests.items():
+            got = evaluate(
+                input,
+                env = pep508_env(target_platform),
+            )
+            env.expect.that_bool(got).equals(want)
+
+_tests.append(_evaluate_with_aliases)
+
 def evaluate_test_suite(name):  # buildifier: disable=function-docstring
     test_suite(
         name = name,