fix(pip.parse): pass requirements without env markers to the whl_library

With this change the environment markers from the requirements.txt files
no longer end up in the whl_library definitions. The alternative would be
to fix this in the whl_library itself and do the string manipulation then.
However, this means that we will be doing refetching of the repository when
the markers change and the overall behaviour may be more complex. This
solution also makes the MODULE.bazel.lock files simpler.

That said, I am 50/50 on putting it in this way, so I can be easily convinced
to put it in the whl_library if there is preference.

Author: aignas

CHANGELOG.md

@@ -58,6 +58,10 @@ Unreleased changes template.
 ### Fixed
 * (py_wheel) Use the default shell environment when building wheels to allow
   toolchains that search PATH to be used for the wheel builder tool.
+* (pip.parse) The requirement argument parsed to `whl_library` will now not have
+  env marker information allowing `bazel query` to work in cases where the `whl`
+  is available for all of the platforms and the sdist can be built.
+  Work towards [#2450](https://github.com/bazelbuild/rules_python/issues/2450).
 
 {#v0-0-0-added}
 ### Added

python/private/pypi/extension.bzl

@@ -292,7 +292,7 @@ def _create_whl_repos(
                     args.pop("download_only", None)
 
                     repo_name = whl_repo_name(pip_name, distribution.filename, distribution.sha256)
-                    args["requirement"] = requirement.srcs.requirement
+                    args["requirement"] = _requirement_without_marker(requirement.srcs.requirement)
                     args["urls"] = [distribution.url]
                     args["sha256"] = distribution.sha256
                     args["filename"] = distribution.filename
@@ -324,7 +324,7 @@ def _create_whl_repos(
                 logger.warn(lambda: "falling back to pip for installing the right file for {}".format(requirement.requirement_line))
 
             args = dict(whl_library_args)  # make a copy
-            args["requirement"] = requirement.requirement_line
+            args["requirement"] = _requirement_without_marker(requirement.requirement_line)
             if requirement.extra_pip_args:
                 args["extra_pip_args"] = requirement.extra_pip_args
 
@@ -535,6 +535,25 @@ You cannot use both the additive_build_content and additive_build_content_file a
         is_reproducible = is_reproducible,
     )
 
+def _requirement_without_marker(requirement):
+    requirement, _, maybe_hashes = requirement.partition(";")
+    ret = requirement.strip(" ")
+    _, marker, maybe_hashes = maybe_hashes.partition("--hash=")
+    if not maybe_hashes:
+        ret, marker, maybe_hashes = ret.partition("--hash=")
+
+    if maybe_hashes:
+        return "{} {}{}".format(
+            ret.strip(" "),
+            marker.strip(" "),
+            " --hash=".join([
+                h.strip(" ")
+                for h in maybe_hashes.split("--hash=")
+            ]),
+        )
+    else:
+        return ret
+
 def _pip_impl(module_ctx):
     """Implementation of a class tag that creates the pip hub and corresponding pip spoke whl repositories.
 

tests/pypi/extension/extension_tests.bzl

@@ -28,7 +28,10 @@ def _mock_mctx(*modules, environ = {}, read = None):
             name = "unittest",
             arch = "exotic",
         ),
-        read = read or (lambda _: "simple==0.0.1 --hash=sha256:deadbeef --hash=sha256:deadbaaf"),
+        read = read or (lambda _: """\
+simple==0.0.1 \
+    --hash=sha256:deadbeef \
+    --hash=sha256:deadbaaf"""),
         modules = [
             struct(
                 name = modules[0].name,
@@ -262,7 +265,8 @@ def _test_simple_with_markers(env):
             read = lambda x: {
                 "universal.txt": """\
 torch==2.4.1+cpu ; platform_machine == 'x86_64'
-torch==2.4.1 ; platform_machine != 'x86_64'
+torch==2.4.1 ; platform_machine != 'x86_64' \
+    --hash=sha256:deadbeef
 """,
             }[x],
         ),
@@ -313,13 +317,13 @@ torch==2.4.1 ; platform_machine != 'x86_64'
             "dep_template": "@pypi//{name}:{target}",
             "python_interpreter_target": "unit_test_interpreter_target",
             "repo": "pypi_315",
-            "requirement": "torch==2.4.1 ; platform_machine != 'x86_64'",
+            "requirement": "torch==2.4.1 --hash=sha256:deadbeef",
         },
         "pypi_315_torch_linux_x86_64_osx_x86_64_windows_x86_64": {
             "dep_template": "@pypi//{name}:{target}",
             "python_interpreter_target": "unit_test_interpreter_target",
             "repo": "pypi_315",
-            "requirement": "torch==2.4.1+cpu ; platform_machine == 'x86_64'",
+            "requirement": "torch==2.4.1+cpu",
         },
     })
     pypi.whl_mods().contains_exactly({})
@@ -351,16 +355,19 @@ def _test_download_only_multiple(env):
 --implementation=cp
 --abi=cp315
 
-simple==0.0.1 --hash=sha256:deadbeef
-extra==0.0.1 --hash=sha256:deadb00f
+simple==0.0.1 \
+    --hash=sha256:deadbeef
+extra==0.0.1 \
+    --hash=sha256:deadb00f
 """,
                 "requirements.osx_aarch64.txt": """\
 --platform=macosx_10_9_arm64
 --python-version=315
 --implementation=cp
 --abi=cp315
 
-simple==0.0.3 --hash=sha256:deadbaaf
+simple==0.0.3 \
+    --hash=sha256:deadbaaf
 """,
             }[x],
         ),
@@ -473,7 +480,9 @@ def _test_simple_get_index(env):
             ),
             read = lambda x: {
                 "requirements.txt": """
-simple==0.0.1 --hash=sha256:deadbeef --hash=sha256:deadb00f
+simple==0.0.1 \
+    --hash=sha256:deadbeef \
+    --hash=sha256:deadb00f
 some_pkg==0.0.1
 """,
             }[x],