code reuse and turn off warning printing in tests

aignas · aignas · commit e9cef5498e2e · 2025-09-07T21:29:21.000+09:00
diff --git a/python/private/pypi/BUILD.bazel b/python/private/pypi/BUILD.bazel
@@ -111,6 +111,7 @@ bzl_library(
     deps = [
         ":evaluate_markers_bzl",
         ":hub_builder_bzl",
+        ":platform_bzl",
         ":hub_repository_bzl",
         ":parse_whl_name_bzl",
         ":pep508_env_bzl",
diff --git a/python/private/pypi/extension.bzl b/python/private/pypi/extension.bzl
@@ -28,6 +28,7 @@ load(":parse_whl_name.bzl", "parse_whl_name")
 load(":pep508_env.bzl", "env")
 load(":pip_repository_attrs.bzl", "ATTRS")
 load(":simpleapi_download.bzl", "simpleapi_download")
+load(":platform.bzl", _plat = "platform")
 load(":whl_library.bzl", "whl_library")
 
 def _whl_mods_impl(whl_mods_dict):
@@ -55,31 +56,6 @@ def _whl_mods_impl(whl_mods_dict):
             whl_mods = whl_mods,
         )
 
-def _plat(*, name, arch_name, os_name, config_settings = [], env = {}, marker = "", whl_abi_tags = [], whl_platform_tags = []):
-    # NOTE @aignas 2025-07-08: the least preferred is the first item in the list
-    if "any" not in whl_platform_tags:
-        # the lowest priority one needs to be the first one
-        whl_platform_tags = ["any"] + whl_platform_tags
-
-    whl_abi_tags = whl_abi_tags or ["abi3", "cp{major}{minor}"]
-    if "none" not in whl_abi_tags:
-        # the lowest priority one needs to be the first one
-        whl_abi_tags = ["none"] + whl_abi_tags
-
-    return struct(
-        name = name,
-        arch_name = arch_name,
-        os_name = os_name,
-        config_settings = config_settings,
-        env = {
-            # defaults for env
-            "implementation_name": "cpython",
-        } | env,
-        marker = marker,
-        whl_abi_tags = whl_abi_tags,
-        whl_platform_tags = whl_platform_tags,
-    )
-
 def _configure(config, *, override = False, **kwargs):
     """Set the value in the config if the value is provided"""
     env = kwargs.get("env")
diff --git a/python/private/pypi/platform.bzl b/python/private/pypi/platform.bzl
@@ -0,0 +1,44 @@
+"""A common platform structure for using internally."""
+
+def platform(*, name, arch_name, os_name, config_settings = [], env = {}, marker = "", whl_abi_tags = [], whl_platform_tags = []):
+    """A platform structure for using internally.
+
+    Args:
+        name: {type}`str` the human friendly name of the platform.
+        arch_name: {type}`str` the @platforms//cpu:<arch_name> value.
+        os_name: {type}`str` the @platforms//os:<os_name> value.
+        config_settings: {type}`list[Label|str]` The list of labels for selecting the
+            platform.
+        env: {type}`dict[str, str]` the PEP508 environment for marker evaluation.
+        marker: {type}`str` the env marker expression that is evaluated to determine if we
+            should use the platform. This is useful to turn on certain platforms for
+            particular python versions.
+        whl_abi_tags: {type}`list[str]` A list of values for matching abi tags.
+        whl_platform_tags: {type}`list[str]` A list of values for matching platform tags.
+
+    Returns:
+        struct with the necessary values for pipstar implementation.
+    """
+    # NOTE @aignas 2025-07-08: the least preferred is the first item in the list
+    if "any" not in whl_platform_tags:
+        # the lowest priority one needs to be the first one
+        whl_platform_tags = ["any"] + whl_platform_tags
+
+    whl_abi_tags = whl_abi_tags or ["abi3", "cp{major}{minor}"]
+    if "none" not in whl_abi_tags:
+        # the lowest priority one needs to be the first one
+        whl_abi_tags = ["none"] + whl_abi_tags
+
+    return struct(
+        name = name,
+        arch_name = arch_name,
+        os_name = os_name,
+        config_settings = config_settings,
+        env = {
+            # defaults for env
+            "implementation_name": "cpython",
+        } | env,
+        marker = marker,
+        whl_abi_tags = whl_abi_tags,
+        whl_platform_tags = whl_platform_tags,
+    )
diff --git a/tests/pypi/extension/extension_tests.bzl b/tests/pypi/extension/extension_tests.bzl
@@ -18,6 +18,7 @@ load("@rules_testing//lib:test_suite.bzl", "test_suite")
 load("@rules_testing//lib:truth.bzl", "subjects")
 load("//python/private/pypi:extension.bzl", "build_config", "parse_modules")  # buildifier: disable=bzl-visibility
 load("//python/private/pypi:whl_config_setting.bzl", "whl_config_setting")  # buildifier: disable=bzl-visibility
+load(":pip_parse.bzl", _parse = "pip_parse")
 
 _tests = []
 
@@ -133,74 +134,6 @@ def _default(
         whl_platform_tags = whl_platform_tags or [],
     )
 
-def _parse(
-        *,
-        hub_name,
-        python_version,
-        add_libdir_to_library_search_path = False,
-        auth_patterns = {},
-        download_only = False,
-        enable_implicit_namespace_pkgs = False,
-        environment = {},
-        envsubst = {},
-        experimental_index_url = "",
-        experimental_requirement_cycles = {},
-        experimental_target_platforms = [],
-        extra_hub_aliases = {},
-        extra_pip_args = [],
-        isolated = True,
-        netrc = None,
-        parse_all_requirements_files = True,
-        pip_data_exclude = None,
-        python_interpreter = None,
-        python_interpreter_target = None,
-        quiet = True,
-        requirements_by_platform = {},
-        requirements_darwin = None,
-        requirements_linux = None,
-        requirements_lock = None,
-        requirements_windows = None,
-        simpleapi_skip = [],
-        timeout = 600,
-        whl_modifications = {},
-        **kwargs):
-    return struct(
-        auth_patterns = auth_patterns,
-        add_libdir_to_library_search_path = add_libdir_to_library_search_path,
-        download_only = download_only,
-        enable_implicit_namespace_pkgs = enable_implicit_namespace_pkgs,
-        environment = environment,
-        envsubst = envsubst,
-        experimental_index_url = experimental_index_url,
-        experimental_requirement_cycles = experimental_requirement_cycles,
-        experimental_target_platforms = experimental_target_platforms,
-        extra_hub_aliases = extra_hub_aliases,
-        extra_pip_args = extra_pip_args,
-        hub_name = hub_name,
-        isolated = isolated,
-        netrc = netrc,
-        parse_all_requirements_files = parse_all_requirements_files,
-        pip_data_exclude = pip_data_exclude,
-        python_interpreter = python_interpreter,
-        python_interpreter_target = python_interpreter_target,
-        python_version = python_version,
-        quiet = quiet,
-        requirements_by_platform = requirements_by_platform,
-        requirements_darwin = requirements_darwin,
-        requirements_linux = requirements_linux,
-        requirements_lock = requirements_lock,
-        requirements_windows = requirements_windows,
-        timeout = timeout,
-        whl_modifications = whl_modifications,
-        # The following are covered by other unit tests
-        experimental_extra_index_urls = [],
-        parallel_download = False,
-        experimental_index_url_overrides = {},
-        simpleapi_skip = simpleapi_skip,
-        _evaluate_markers_srcs = [],
-        **kwargs
-    )
-
 def _test_simple(env):
     pypi = _parse_modules(
         env,
diff --git a/tests/pypi/extension/pip_parse.bzl b/tests/pypi/extension/pip_parse.bzl
@@ -0,0 +1,70 @@
+"""A simple test helper"""
+
+def pip_parse(
+        *,
+        hub_name,
+        python_version,
+        add_libdir_to_library_search_path = False,
+        auth_patterns = {},
+        download_only = False,
+        enable_implicit_namespace_pkgs = False,
+        environment = {},
+        envsubst = {},
+        experimental_index_url = "",
+        experimental_requirement_cycles = {},
+        experimental_target_platforms = [],
+        extra_hub_aliases = {},
+        extra_pip_args = [],
+        isolated = True,
+        netrc = None,
+        parse_all_requirements_files = True,
+        pip_data_exclude = None,
+        python_interpreter = None,
+        python_interpreter_target = None,
+        quiet = True,
+        requirements_by_platform = {},
+        requirements_darwin = None,
+        requirements_linux = None,
+        requirements_lock = None,
+        requirements_windows = None,
+        simpleapi_skip = [],
+        timeout = 600,
+        whl_modifications = {},
+        **kwargs):
+    """A simple helper for testing to simulate the PyPI extension parse tag class"""
+    return struct(
+        auth_patterns = auth_patterns,
+        add_libdir_to_library_search_path = add_libdir_to_library_search_path,
+        download_only = download_only,
+        enable_implicit_namespace_pkgs = enable_implicit_namespace_pkgs,
+        environment = environment,
+        envsubst = envsubst,
+        experimental_index_url = experimental_index_url,
+        experimental_requirement_cycles = experimental_requirement_cycles,
+        experimental_target_platforms = experimental_target_platforms,
+        extra_hub_aliases = extra_hub_aliases,
+        extra_pip_args = extra_pip_args,
+        hub_name = hub_name,
+        isolated = isolated,
+        netrc = netrc,
+        parse_all_requirements_files = parse_all_requirements_files,
+        pip_data_exclude = pip_data_exclude,
+        python_interpreter = python_interpreter,
+        python_interpreter_target = python_interpreter_target,
+        python_version = python_version,
+        quiet = quiet,
+        requirements_by_platform = requirements_by_platform,
+        requirements_darwin = requirements_darwin,
+        requirements_linux = requirements_linux,
+        requirements_lock = requirements_lock,
+        requirements_windows = requirements_windows,
+        timeout = timeout,
+        whl_modifications = whl_modifications,
+        # The following are covered by other unit tests
+        experimental_extra_index_urls = [],
+        parallel_download = False,
+        experimental_index_url_overrides = {},
+        simpleapi_skip = simpleapi_skip,
+        _evaluate_markers_srcs = [],
+        **kwargs
+    )
diff --git a/tests/pypi/hub_builder/hub_builder_tests.bzl b/tests/pypi/hub_builder/hub_builder_tests.bzl
@@ -20,6 +20,8 @@ load("//python/private:repo_utils.bzl", "REPO_DEBUG_ENV_VAR", "REPO_VERBOSITY_EN
 load("//python/private/pypi:hub_builder.bzl", _hub_builder = "hub_builder")  # buildifier: disable=bzl-visibility
 load("//python/private/pypi:parse_simpleapi_html.bzl", "parse_simpleapi_html")  # buildifier: disable=bzl-visibility
 load("//python/private/pypi:whl_config_setting.bzl", "whl_config_setting")  # buildifier: disable=bzl-visibility
+load("//tests/pypi/extension:pip_parse.bzl", _parse = "pip_parse")
+load("//python/private/pypi:platform.bzl", _plat = "platform")
 
 _tests = []
 
@@ -36,33 +38,6 @@ simple==0.0.1 \
     --hash=sha256:deadbaaf"""),
     )
 
-# TODO @aignas 2025-09-07: reuse the same function from
-# //python/private/pypi:extension.bzl
-def _plat(*, name, arch_name, os_name, config_settings = [], env = {}, marker = "", whl_abi_tags = [], whl_platform_tags = []):
-    # NOTE @aignas 2025-07-08: the least preferred is the first item in the list
-    if "any" not in whl_platform_tags:
-        # the lowest priority one needs to be the first one
-        whl_platform_tags = ["any"] + whl_platform_tags
-
-    whl_abi_tags = whl_abi_tags or ["abi3", "cp{major}{minor}"]
-    if "none" not in whl_abi_tags:
-        # the lowest priority one needs to be the first one
-        whl_abi_tags = ["none"] + whl_abi_tags
-
-    return struct(
-        name = name,
-        arch_name = arch_name,
-        os_name = os_name,
-        config_settings = config_settings,
-        env = {
-            # defaults for env
-            "implementation_name": "cpython",
-        } | env,
-        marker = marker,
-        whl_abi_tags = whl_abi_tags,
-        whl_platform_tags = whl_platform_tags,
-    )
-
 def hub_builder(
         env,
         enable_pipstar = 0,
@@ -108,14 +83,17 @@ def hub_builder(
         },
         simpleapi_download_fn = simpleapi_download_fn or (lambda *a, **k: {}),
         evaluate_markers_fn = evaluate_markers_fn,
-        logger = repo_utils.logger(struct(
-            os = struct(
-                environ = {
-                    REPO_DEBUG_ENV_VAR: "1",
-                    REPO_VERBOSITY_ENV_VAR: "TRACE" if debug else "INFO",
-                },
+        logger = repo_utils.logger(
+            struct(
+                os = struct(
+                    environ = {
+                        REPO_DEBUG_ENV_VAR: "1",
+                        REPO_VERBOSITY_ENV_VAR: "TRACE" if debug else "FAIL",
+                    },
+                ),
             ),
-        ), "unit-test"),
+            "unit-test",
+        ),
     )
     self = struct(
         build = lambda *a, **k: env.expect.that_struct(
@@ -132,74 +110,6 @@ def hub_builder(
     )
     return self
 
-def _parse(
-        *,
-        hub_name,
-        python_version,
-        add_libdir_to_library_search_path = False,
-        auth_patterns = {},
-        download_only = False,
-        enable_implicit_namespace_pkgs = False,
-        environment = {},
-        envsubst = {},
-        experimental_index_url = "",
-        experimental_requirement_cycles = {},
-        experimental_target_platforms = [],
-        extra_hub_aliases = {},
-        extra_pip_args = [],
-        isolated = True,
-        netrc = None,
-        parse_all_requirements_files = True,
-        pip_data_exclude = None,
-        python_interpreter = None,
-        python_interpreter_target = None,
-        quiet = True,
-        requirements_by_platform = {},
-        requirements_darwin = None,
-        requirements_linux = None,
-        requirements_lock = None,
-        requirements_windows = None,
-        simpleapi_skip = [],
-        timeout = 600,
-        whl_modifications = {},
-        **kwargs):
-    return struct(
-        auth_patterns = auth_patterns,
-        add_libdir_to_library_search_path = add_libdir_to_library_search_path,
-        download_only = download_only,
-        enable_implicit_namespace_pkgs = enable_implicit_namespace_pkgs,
-        environment = environment,
-        envsubst = envsubst,
-        experimental_index_url = experimental_index_url,
-        experimental_requirement_cycles = experimental_requirement_cycles,
-        experimental_target_platforms = experimental_target_platforms,
-        extra_hub_aliases = extra_hub_aliases,
-        extra_pip_args = extra_pip_args,
-        hub_name = hub_name,
-        isolated = isolated,
-        netrc = netrc,
-        parse_all_requirements_files = parse_all_requirements_files,
-        pip_data_exclude = pip_data_exclude,
-        python_interpreter = python_interpreter,
-        python_interpreter_target = python_interpreter_target,
-        python_version = python_version,
-        quiet = quiet,
-        requirements_by_platform = requirements_by_platform,
-        requirements_darwin = requirements_darwin,
-        requirements_linux = requirements_linux,
-        requirements_lock = requirements_lock,
-        requirements_windows = requirements_windows,
-        timeout = timeout,
-        whl_modifications = whl_modifications,
-        # The following are covered by other unit tests
-        experimental_extra_index_urls = [],
-        parallel_download = False,
-        experimental_index_url_overrides = {},
-        simpleapi_skip = simpleapi_skip,
-        _evaluate_markers_srcs = [],
-        **kwargs
-    )
-
 def _test_simple(env):
     builder = hub_builder(env)
     builder.pip_parse(
