Merge branch 'refactor/store-dists-in-reqs' into next/multi-platform-whls

Author: aignas

python/pip_install/pip_repository.bzl

@@ -584,7 +584,17 @@ python_interpreter. An example value: "@python3_x86_64-unknown-linux-gnu//:pytho
     ),
     "quiet": attr.bool(
         default = True,
-        doc = "If True, suppress printing stdout and stderr output to the terminal.",
+        doc = """\
+If True, suppress printing stdout and stderr output to the terminal.
+
+If you would like to get more diagnostic output, please use:
+
+    RULES_PYTHON_REPO_DEBUG=1
+
+or
+
+    RULES_PYTHON_REPO_DEBUG_VERBOSITY=<INFO|DEBUG|TRACE>
+""",
     ),
     "repo_prefix": attr.string(
         doc = """

python/private/BUILD.bazel

@@ -140,14 +140,6 @@ bzl_library(
     ],
 )
 
-bzl_library(
-    name = "parse_requirements_add_dists_bzl",
-    srcs = ["parse_requirements_add_dists.bzl"],
-    deps = [
-        ":whl_target_platforms_bzl",
-    ],
-)
-
 bzl_library(
     name = "parse_whl_name_bzl",
     srcs = ["parse_whl_name.bzl"],

python/private/bzlmod/BUILD.bazel

@@ -35,7 +35,6 @@ bzl_library(
         "//python/private:full_version_bzl",
         "//python/private:normalize_name_bzl",
         "//python/private:parse_requirements_bzl",
-        "//python/private:parse_requirements_add_dists_bzl",
         "//python/private:parse_whl_name_bzl",
         "//python/private:version_label_bzl",
         ":bazel_features_bzl",

python/private/bzlmod/pip.bzl

@@ -584,13 +584,6 @@ The Python version the dependencies are targetting, in Major.Minor format
 If an interpreter isn't explicitly provided (using `python_interpreter` or
 `python_interpreter_target`), then the version specified here must have
 a corresponding `python.toolchain()` configured.
-""",
-        ),
-        "verbosity": attr.string(
-            default = "",
-            values = ["TRACE", "DEBUG", "INFO"],
-            doc = """
-The verbosity with which we should print diagnostic messages when 'quiet = False'.
 """,
         ),
         "whl_modifications": attr.label_keyed_string_dict(

python/private/repo_utils.bzl

@@ -51,13 +51,13 @@ def _logger(rctx):
     Returns:
         A struct with attributes logging: trace, debug, info, warn, fail.
     """
-    debug_value = rctx.os.environ.get(REPO_DEBUG_ENV_VAR)
-    if debug_value == "1":
+    if _is_repo_debug_enabled(rctx):
         verbosity_level = "DEBUG"
     else:
         verbosity_level = "WARN"
 
-    verbosity_level = rctx.os.environ.get(REPO_VERBOSITY_ENV_VAR) or verbosity_level
+    env_var_verbosity = rctx.os.environ.get(REPO_VERBOSITY_ENV_VAR)
+    verbosity_level = env_var_verbosity or verbosity_level
 
     verbosity = {
         "DEBUG": 2,
@@ -69,7 +69,7 @@ def _logger(rctx):
         if verbosity < enabled_on_verbosity:
             return
 
-        print("{}: ".format(level.upper()), message_cb())  # buildifier: disable=print
+        print("\nrules_python: {}: ".format(level.upper()), message_cb())  # buildifier: disable=print
 
     return struct(
         trace = lambda message_cb: _log(3, "TRACE", message_cb),

tests/private/whl_target_platforms/select_whl_tests.bzl

@@ -135,7 +135,7 @@ def _test_select_abi3(env):
 _tests.append(_test_select_abi3)
 
 def _test_select_by_supported_py_version(env):
-    for want_version, match in {
+    for want_python_version, match in {
         "3.11": "pkg-0.0.1-py311-abi3-any.whl",
         "3.8": "pkg-0.0.1-py3-abi3-any.whl",
     }.items():
@@ -147,14 +147,14 @@ def _test_select_by_supported_py_version(env):
             ],
             want_abis = ["abi3"],
             want_platforms = ["ignored"],
-            want_version = want_version,
+            want_python_version = want_python_version,
         )
         _match(env, got, match)
 
 _tests.append(_test_select_by_supported_py_version)
 
 def _test_select_by_supported_cp_version(env):
-    for want_version, match in {
+    for want_python_version, match in {
         "3.11": "pkg-0.0.1-cp311-abi3-any.whl",
         "3.8": "pkg-0.0.1-py3-abi3-any.whl",
     }.items():
@@ -167,14 +167,14 @@ def _test_select_by_supported_cp_version(env):
             ],
             want_abis = ["abi3"],
             want_platforms = ["ignored"],
-            want_version = want_version,
+            want_python_version = want_python_version,
         )
         _match(env, got, match)
 
 _tests.append(_test_select_by_supported_cp_version)
 
 def _test_supported_cp_version_manylinux(env):
-    for want_version, match in {
+    for want_python_version, match in {
         "3.11": "pkg-0.0.1-cp311-none-manylinux_x86_64.whl",
         "3.8": "pkg-0.0.1-py3-none-manylinux_x86_64.whl",
     }.items():
@@ -187,7 +187,7 @@ def _test_supported_cp_version_manylinux(env):
             ],
             want_abis = ["none"],
             want_platforms = ["linux_x86_64"],
-            want_version = want_version,
+            want_python_version = want_python_version,
         )
         _match(env, got, match)
 
@@ -207,7 +207,7 @@ _tests.append(_test_ignore_unsupported)
 
 def _test_match_abi_and_not_py_version(env):
     # Check we match the ABI and not the py version
-    got = _select_whls(whls = WHL_LIST, want_abis = ["cp37m"], want_platforms = ["linux_x86_64"], want_version = "3.7")
+    got = _select_whls(whls = WHL_LIST, want_abis = ["cp37m"], want_platforms = ["linux_x86_64"], want_python_version = "3.7")
     _match(
         env,
         got,
@@ -221,7 +221,7 @@ _tests.append(_test_match_abi_and_not_py_version)
 
 def _test_select_filename_with_many_tags(env):
     # Check we can select a filename with many platform tags
-    got = _select_whls(whls = WHL_LIST, want_abis = ["cp39"], want_platforms = ["linux_x86_32"], want_version = "3.9")
+    got = _select_whls(whls = WHL_LIST, want_abis = ["cp39"], want_platforms = ["linux_x86_32"], want_python_version = "3.9")
     _match(
         env,
         got,
@@ -239,7 +239,7 @@ def _test_osx_prefer_arch_specific(env):
         whls = WHL_LIST,
         want_abis = ["cp311"],
         want_platforms = ["osx_x86_64", "osx_x86_32"],
-        want_version = "3.11",
+        want_python_version = "3.11",
     )
     _match(
         env,
@@ -250,7 +250,7 @@ def _test_osx_prefer_arch_specific(env):
     got = _select_whl(whls = got, want_platform = "osx_x86_64")
     _match(env, got, "pkg-0.0.1-cp311-cp311-macosx_10_9_x86_64.whl")
 
-    got = _select_whls(whls = WHL_LIST, want_abis = ["cp311"], want_platforms = ["osx_aarch64"], want_version = "3.11")
+    got = _select_whls(whls = WHL_LIST, want_abis = ["cp311"], want_platforms = ["osx_aarch64"], want_python_version = "3.11")
     _match(
         env,
         got,
@@ -264,7 +264,7 @@ _tests.append(_test_osx_prefer_arch_specific)
 
 def _test_osx_fallback_to_universal2(env):
     # Check that we can use the universal2 if the arm wheel is not available
-    got = _select_whls(whls = [w for w in WHL_LIST if "arm64" not in w], want_abis = ["cp311"], want_platforms = ["osx_aarch64"], want_version = "3.11")
+    got = _select_whls(whls = [w for w in WHL_LIST if "arm64" not in w], want_abis = ["cp311"], want_platforms = ["osx_aarch64"], want_python_version = "3.11")
     _match(
         env,
         got,
@@ -277,7 +277,7 @@ _tests.append(_test_osx_fallback_to_universal2)
 
 def _test_prefer_manylinux_wheels(env):
     # Check we prefer platform specific wheels
-    got = _select_whls(whls = WHL_LIST, want_abis = ["none", "abi3", "cp39"], want_platforms = ["linux_x86_64"], want_version = "3.9")
+    got = _select_whls(whls = WHL_LIST, want_abis = ["none", "abi3", "cp39"], want_platforms = ["linux_x86_64"], want_python_version = "3.9")
     _match(
         env,
         got,