wip

Author: aignas

python/private/pypi/extension.bzl

@@ -18,8 +18,8 @@ load("@bazel_features//:features.bzl", "bazel_features")
 load("@pythons_hub//:interpreters.bzl", "INTERPRETER_LABELS")
 load("@pythons_hub//:versions.bzl", "MINOR_MAPPING")
 load("//python/private:auth.bzl", "AUTH_ATTRS")
-load("//python/private:normalize_name.bzl", "normalize_name")
 load("//python/private:full_version.bzl", "full_version")
+load("//python/private:normalize_name.bzl", "normalize_name")
 load("//python/private:repo_utils.bzl", "repo_utils")
 load("//python/private:semver.bzl", "semver")
 load("//python/private:version_label.bzl", "version_label")
@@ -163,8 +163,8 @@ def _create_whl_repos(
             requirements_windows = pip_attr.requirements_windows,
             extra_pip_args = pip_attr.extra_pip_args,
             python_version = full_version(
-                version=pip_attr.python_version,
-                minor_mapping=minor_mapping,
+                version = pip_attr.python_version,
+                minor_mapping = minor_mapping,
             ),
             logger = logger,
         ),

python/private/pypi/pkg_aliases.bzl

@@ -370,6 +370,7 @@ def get_filename_config_settings(
             py = "py3_"
 
         abi = parsed.abi_tag
+
         # TODO @aignas 2025-04-20: test
         abi, _, _ = abi.partition(".")
 

python/private/pypi/whl_config_setting.bzl

@@ -42,13 +42,13 @@ def whl_config_setting(*, version = None, config_setting = None, filename = None
                 fail("target_platform should start with 'cp' denoting the python version, got: " + p)
 
             abi, _, tail = p.partition("_")
+
             # drop the micro version here, currently there is no usecase to use
             # multiple python interpreters with the same minor version but
             # different micro version.
             abi, _, _ = abi.partition(".")
             target_platforms.append("{}_{}".format(abi, tail))
 
-
     return struct(
         config_setting = config_setting,
         filename = filename,

python/private/pypi/whl_library_targets.bzl

@@ -369,26 +369,22 @@ def _config_settings(dependencies_by_platform, native = native, **kwargs):
         if p.startswith("@") or p.endswith("default"):
             continue
 
+        # TODO @aignas 2025-04-20: add tests here
         abi, _, tail = p.partition("_")
         if not abi.startswith("cp"):
             tail = p
             abi = ""
-
         os, _, arch = tail.partition("_")
-        os = "" if os == "anyos" else os
-        arch = "" if arch == "anyarch" else arch
 
         _kwargs = dict(kwargs)
-        if arch:
-            _kwargs.setdefault("constraint_values", []).append("@platforms//cpu:{}".format(arch))
-        if os:
-            _kwargs.setdefault("constraint_values", []).append("@platforms//os:{}".format(os))
+        _kwargs["constraint_values"] = [
+            "@platforms//cpu:{}".format(arch),
+            "@platforms//os:{}".format(os),
+        ]
 
         if abi:
             _kwargs["flag_values"] = {
-                "@rules_python//python/config_settings:python_version_major_minor": "3.{minor_version}".format(
-                    minor_version = abi[len("cp3"):],
-                ),
+                str(Label("//python/config_settings:python_version")): "3.{}".format(abi[len("cp3"):])
             }
 
         native.config_setting(

python/private/pypi/whl_target_platforms.bzl

@@ -77,6 +77,7 @@ def select_whls(*, whls, want_platforms = [], logger = None):
         abi, _, os_cpu = p.partition("_")
         abi, _, _ = abi.partition(".")
         _want_platforms[os_cpu] = None
+
         # TODO @aignas 2025-04-20: add a test
         _want_platforms["{}_{}".format(abi, os_cpu)] = None