fix python evaluate markers for WORKSPACE

Author: aignas

examples/pip_parse_vendored/.bazelversion

@@ -0,0 +1 @@
+7.x

python/private/pypi/BUILD.bazel

@@ -113,15 +113,13 @@ bzl_library(
         ":deps_bzl",
         ":pep508_evaluate_bzl",
         ":pep508_requirement_bzl",
-        ":pypi_repo_utils_bzl",
     ],
 )
 
 bzl_library(
     name = "extension_bzl",
     srcs = ["extension.bzl"],
     deps = [
-        ":evaluate_markers_bzl",
         ":hub_builder_bzl",
         ":hub_repository_bzl",
         ":parse_whl_name_bzl",

python/private/pypi/evaluate_markers.bzl

@@ -14,19 +14,8 @@
 
 """A simple function that evaluates markers using a python interpreter."""
 
-load(":deps.bzl", "record_files")
 load(":pep508_evaluate.bzl", "evaluate")
 load(":pep508_requirement.bzl", "requirement")
-load(":pypi_repo_utils.bzl", "pypi_repo_utils")
-
-# Used as a default value in a rule to ensure we fetch the dependencies.
-SRCS = [
-    # When the version, or any of the files in `packaging` package changes,
-    # this file will change as well.
-    record_files["pypi__packaging"],
-    Label("//python/private/pypi/requirements_parser:resolve_target_platforms.py"),
-    Label("//python/private/pypi/whl_installer:platform.py"),
-]
 
 def evaluate_markers(*, requirements, platforms):
     """Return the list of supported platforms per requirements line.
@@ -51,57 +40,3 @@ def evaluate_markers(*, requirements, platforms):
                 ret.setdefault(req_string, []).append(platform_str)
 
     return ret
-
-def evaluate_markers_py(mrctx, *, requirements, python_interpreter, python_interpreter_target, srcs, logger = None):
-    """Return the list of supported platforms per requirements line.
-
-    Args:
-        mrctx: repository_ctx or module_ctx.
-        requirements: {type}`dict[str, list[str]]` of the requirement file lines to evaluate.
-        python_interpreter: str, path to the python_interpreter to use to
-            evaluate the env markers in the given requirements files. It will
-            be only called if the requirements files have env markers. This
-            should be something that is in your PATH or an absolute path.
-        python_interpreter_target: Label, same as python_interpreter, but in a
-            label format.
-        srcs: list[Label], the value of SRCS passed from the `rctx` or `mctx` to this function.
-        logger: repo_utils.logger or None, a simple struct to log diagnostic
-            messages. Defaults to None.
-
-    Returns:
-        dict of string lists with target platforms
-    """
-    if not requirements:
-        return {}
-
-    in_file = mrctx.path("requirements_with_markers.in.json")
-    out_file = mrctx.path("requirements_with_markers.out.json")
-    mrctx.file(in_file, json.encode(requirements))
-
-    interpreter = pypi_repo_utils.resolve_python_interpreter(
-        mrctx,
-        python_interpreter = python_interpreter,
-        python_interpreter_target = python_interpreter_target,
-    )
-
-    pypi_repo_utils.execute_checked(
-        mrctx,
-        op = "ResolveRequirementEnvMarkers({})".format(in_file),
-        python = interpreter,
-        arguments = [
-            "-m",
-            "python.private.pypi.requirements_parser.resolve_target_platforms",
-            in_file,
-            out_file,
-        ],
-        srcs = srcs,
-        environment = {
-            "PYTHONHOME": str(interpreter.dirname),
-            "PYTHONPATH": [
-                Label("@pypi__packaging//:BUILD.bazel"),
-                Label("//:BUILD.bazel"),
-            ],
-        },
-        logger = logger,
-    )
-    return json.decode(mrctx.read(out_file))

python/private/pypi/extension.bzl

@@ -20,7 +20,6 @@ load("@rules_python_internal//:rules_python_config.bzl", rp_config = "config")
 load("//python/private:auth.bzl", "AUTH_ATTRS")
 load("//python/private:normalize_name.bzl", "normalize_name")
 load("//python/private:repo_utils.bzl", "repo_utils")
-load(":evaluate_markers.bzl", EVALUATE_MARKERS_SRCS = "SRCS")
 load(":hub_builder.bzl", "hub_builder")
 load(":hub_repository.bzl", "hub_repository", "whl_config_settings_to_json")
 load(":parse_whl_name.bzl", "parse_whl_name")
@@ -704,13 +703,6 @@ a string `"{os}_{arch}"` as the value here. You could also use `"{os}_{arch}_fre
             doc = """\
 A dict of labels to wheel names that is typically generated by the whl_modifications.
 The labels are JSON config files describing the modifications.
-""",
-        ),
-        "_evaluate_markers_srcs": attr.label_list(
-            default = EVALUATE_MARKERS_SRCS,
-            doc = """\
-The list of labels to use as SRCS for the marker evaluation code. This ensures that the
-code will be re-evaluated when any of files in the default changes.
 """,
         ),
     }, **ATTRS)

python/private/pypi/pip_repository.bzl

@@ -18,9 +18,11 @@ load("@bazel_skylib//lib:sets.bzl", "sets")
 load("//python/private:normalize_name.bzl", "normalize_name")
 load("//python/private:repo_utils.bzl", "REPO_DEBUG_ENV_VAR", "repo_utils")
 load("//python/private:text_util.bzl", "render")
-load(":evaluate_markers.bzl", "evaluate_markers_py", EVALUATE_MARKERS_SRCS = "SRCS")
+load(":evaluate_markers.bzl", "evaluate_markers")
 load(":parse_requirements.bzl", "host_platform", "parse_requirements", "select_requirement")
+load(":pep508_env.bzl", "env")
 load(":pip_repository_attrs.bzl", "ATTRS")
+load(":pypi_repo_utils.bzl", "pypi_repo_utils")
 load(":render_pkg_aliases.bzl", "render_pkg_aliases")
 load(":requirements_files_by_platform.bzl", "requirements_files_by_platform")
 
@@ -83,6 +85,18 @@ exports_files(["requirements.bzl"])
 
 def _pip_repository_impl(rctx):
     logger = repo_utils.logger(rctx)
+    python_interpreter = pypi_repo_utils.resolve_python_interpreter(
+        rctx,
+        python_interpreter = rctx.attr.python_interpreter,
+        python_interpreter_target = rctx.attr.python_interpreter_target,
+    )
+    result = rctx.execute([python_interpreter, "--version"])
+    if result.stdout:
+        python_version = result.stdout.strip().split(" ")[-1]
+    else:
+        fail("Could not determine Python version")
+
+    marker_env = env(os = rctx.os.name, arch = rctx.os.arch, python_version = python_version)
     requirements_by_platform = parse_requirements(
         rctx,
         requirements_by_platform = requirements_files_by_platform(
@@ -105,17 +119,24 @@ def _pip_repository_impl(rctx):
             ],
         ),
         extra_pip_args = rctx.attr.extra_pip_args,
-        evaluate_markers = lambda rctx, requirements: evaluate_markers_py(
-            rctx,
+        evaluate_markers = lambda rctx, requirements: evaluate_markers(
             requirements = {
                 # NOTE @aignas 2025-07-07: because we don't distinguish between
                 # freethreaded and non-freethreaded, it is a 1:1 mapping.
                 req: {p: p for p in plats}
                 for req, plats in requirements.items()
             },
-            python_interpreter = rctx.attr.python_interpreter,
-            python_interpreter_target = rctx.attr.python_interpreter_target,
-            srcs = rctx.attr._evaluate_markers_srcs,
+            platforms = {
+                "linux_aarch64": struct(env = marker_env),
+                "linux_arm": struct(env = marker_env),
+                "linux_ppc": struct(env = marker_env),
+                "linux_riscv64": struct(env = marker_env),
+                "linux_s390x": struct(env = marker_env),
+                "linux_x86_64": struct(env = marker_env),
+                "osx_aarch64": struct(env = marker_env),
+                "osx_x86_64": struct(env = marker_env),
+                "windows_x86_64": struct(env = marker_env),
+            },
         ),
         extract_url_srcs = False,
         logger = logger,
@@ -273,13 +294,6 @@ generated using the `package_name` macro.
         _template = attr.label(
             default = ":requirements.bzl.tmpl.workspace",
         ),
-        _evaluate_markers_srcs = attr.label_list(
-            default = EVALUATE_MARKERS_SRCS,
-            doc = """\
-The list of labels to use as SRCS for the marker evaluation code. This ensures that the
-code will be re-evaluated when any of files in the default changes.
-""",
-        ),
         **ATTRS
     ),
     doc = """Accepts a locked/compiled requirements file and installs the dependencies listed within.