Skip to content

Commit 98d311d

Browse files
committed
ray: rebase the hermetic-CPython patch onto 2.59.0's WORKSPACE
Ray 2.59.0 inserts a pypi__pip http_archive override (pip 24.3.1) between the python3_10 load and pip_install_dependencies(), which moved the first hunk's trailing context, so git apply stopped at WORKSPACE:51. The python_register_toolchains block is still there upstream, so the patch is still needed; only its context and offsets change.
1 parent 6e5158a commit 98d311d

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

‎patches/ray/2.59.0/0001-Build-with-a-manylinux-interpreter-not-a-hermetic-CPython.patch‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ Point the py310 runtime and pip_parse at the manylinux image's own CPython
1616
wheel is built for: the pip vendored by that rules_python imports distutils,
1717
which 3.12 removed.
1818

19+
Ray 2.59.0 overrides @pypi__pip with pip 24.3.1 between the python3_10
20+
load and pip_install_dependencies(); that override is kept as is, only the
21+
hermetic interpreter around it is removed.
22+
1923
Upstream-Status: Inappropriate [riscv64 build environment; upstream's own fix would be a rules_python bump, python-build-standalone does publish riscv64 CPython now]
2024
---
2125
diff --git a/WORKSPACE b/WORKSPACE
22-
index 927840e..c70da8c 100644
26+
index 4554595..19b0f0d 100644
2327
--- a/WORKSPACE
2428
+++ b/WORKSPACE
2529
@@ -51,15 +51,6 @@ load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_
@@ -37,8 +41,8 @@ index 927840e..c70da8c 100644
3741
-load("@python3_10//:defs.bzl", python310 = "interpreter")
3842
load("@rules_python//python/pip_install:repositories.bzl", "pip_install_dependencies")
3943

40-
pip_install_dependencies()
41-
@@ -69,7 +60,7 @@ load("@rules_python//python:pip.bzl", "pip_parse")
44+
# The pip that whl_library shells out to, overridden ahead of the one rules_python
45+
@@ -133,7 +124,7 @@ load("@rules_python//python:pip.bzl", "pip_parse")
4246
# For CI scripts use only; not for ray testing.
4347
pip_parse(
4448
name = "py_deps_py310",

0 commit comments

Comments
 (0)