linux building

apmorton · apmorton · commit 3fb879ef5f8a · 2025-08-29T11:05:56.000-05:00
diff --git a/recipe/build-core.bat b/recipe/build-core.bat
@@ -34,15 +34,11 @@ cd python
 echo startup --output_user_root=D:/tmp >> ..\.bazelrc
 echo build --jobs=1 >> ..\.bazelrc
 echo build --subcommands=pretty_print >> ..\.bazelrc
-"%PYTHON%" -m pip install . -vv --no-deps
+"%PYTHON%" -m pip install . -vv --no-deps --no-build-isolation
 
 rem remember the return code
 set RETCODE=%ERRORLEVEL%
 
-rem Now clean everything up so subsequent builds (for potentially
-rem different Python version) do not stumble on some after-effects.
-"%PYTHON%" setup.py clean --all
-
 rem setup.py uses D:\bazel-root and D:\b-o since ray 2.10.0.
 rem Get the drive for SRC_DIR, in case it changes from D:
 @for %%G in  ("%SRC_DIR%") DO @SET DRIVE=%%~dG
diff --git a/recipe/build-core.sh b/recipe/build-core.sh
@@ -42,18 +42,9 @@ echo '----------------------------------------------------'
 cd python/
 export SKIP_THIRDPARTY_INSTALL_CONDA_FORGE=1
 
-"${PYTHON}" -m pip install . -vv --no-deps
-# bazel by default makes everything read-only,
-# which leads to patchelf failing to fix rpath in binaries.
-# find all ray binaries and make them writable
-grep -lR ELF build/ | xargs chmod +w
-
 # now install the thing so conda could pick it up
-"${PYTHON}" setup.py install  --single-version-externally-managed --root=/
+"${PYTHON}" -m pip install . -vv --no-deps --no-build-isolation
 
-# now clean everything up so subsequent builds (for potentially
-# different Python version) do not stumble on some after-effects
-"${PYTHON}" setup.py clean --all
 bazel "--output_user_root=$SRC_DIR/../bazel-root" "--output_base=$SRC_DIR/../b-o" clean
 bazel "--output_user_root=$SRC_DIR/../bazel-root" "--output_base=$SRC_DIR/../b-o" shutdown
 rm -rf "$SRC_DIR/../b-o" "$SRC_DIR/../bazel-root"
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -10,7 +10,7 @@ source:
   patches:
     - patches/0001-Disable-making-entry-scripts.patch
     - patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch
-    - patches/0003-remove-dependencies.patch
+    - patches/0003-Newer-hermetic-python.patch
     # This needs modification for each release
     - patches/0004-update-commit-sha.patch
     # See https://github.com/conda-forge/ray-packages-feedstock/issues/136
@@ -27,8 +27,6 @@ source:
     - patches/0010-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch
     # Avoid building openssl-1.1.1f and redis, not needed in the shipped package
     - patches/0011-do-not-build-redis-openssl.patch
-    # Ray patches grpc, update the patch for 1.67
-    - patches/0012-update-patch-for-grpc-1.67.patch
 
 build:
   number: 0
@@ -96,6 +94,7 @@ outputs:
         - libgrpc
         - openjdk =11
         - setuptools
+        - cython >=3.0.12
       run:
         - python
         - aiohttp >=3.7
@@ -109,7 +108,6 @@ outputs:
         - psutil
         - pyyaml
         - requests
-      run_constrained:
 
     test:
       imports:
diff --git a/recipe/patches/0003-Newer-hermetic-python.patch b/recipe/patches/0003-Newer-hermetic-python.patch
@@ -0,0 +1,64 @@
+From e9922231ab7cdd7a6bba7eedb7ee38c42ae4d057 Mon Sep 17 00:00:00 2001
+From: Austin Morton <austin.morton@aquatic.com>
+Date: Fri, 29 Aug 2025 10:49:09 -0500
+Subject: [PATCH] Newer hermetic python
+
+---
+ BUILD.bazel | 4 ++--
+ WORKSPACE   | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/BUILD.bazel b/BUILD.bazel
+index 804a9591b9..8a4772704e 100644
+--- a/BUILD.bazel
++++ b/BUILD.bazel
+@@ -10,7 +10,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
+ load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+ load("@com_github_grpc_grpc//bazel:cython_library.bzl", "pyx_library")
+ load("@hedron_compile_commands//:refresh_compile_commands.bzl", "refresh_compile_commands")
+-load("@python3_9//:defs.bzl", python39 = "interpreter")
++load("@python3_12//:defs.bzl", python312 = "interpreter")
+ load("@rules_cc//cc:defs.bzl", "cc_proto_library")
+ load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_files")
+ load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
+@@ -26,7 +26,7 @@ package(
+ 
+ py_runtime(
+     name = "python3_runtime",
+-    interpreter = python39,
++    interpreter = python312,
+     python_version = "PY3",
+     visibility = ["//visibility:private"],
+ )
+diff --git a/WORKSPACE b/WORKSPACE
+index e56c6a109b..32e30da344 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -61,12 +61,12 @@ http_archive(
+ load("@rules_python//python:repositories.bzl", "python_register_toolchains")
+ 
+ python_register_toolchains(
+-    name = "python3_9",
+-    python_version = "3.9",
++    name = "python3_12",
++    python_version = "3.12",
+     register_toolchains = False,
+ )
+ 
+-load("@python3_9//:defs.bzl", python39 = "interpreter")
++load("@python3_12//:defs.bzl", python312 = "interpreter")
+ load("@rules_python//python/pip_install:repositories.bzl", "pip_install_dependencies")
+ 
+ pip_install_dependencies()
+@@ -75,7 +75,7 @@ load("@rules_python//python:pip.bzl", "pip_parse")
+ 
+ pip_parse(
+     name = "py_deps_buildkite",
+-    python_interpreter_target = python39,
++    python_interpreter_target = python312,
+     requirements_lock = "//release:requirements_buildkite.txt",
+ )
+ 
+-- 
+2.43.0
+
diff --git a/recipe/patches/0003-remove-dependencies.patch b/recipe/patches/0003-remove-dependencies.patch
diff --git a/recipe/patches/0005-Vendor-grpc-1.67.1.patch b/recipe/patches/0005-Vendor-grpc-1.67.1.patch
@@ -213,6 +213,37 @@ index 83dfba2b95..95d59c2279 100644
               ],
  +            patches = [
  +                "@io_ray//thirdparty/patches:zlib-fdopen.patch",
+diff --git a/thirdparty/patches/grpc-configurable-thread-count.patch b/thirdparty/patches/grpc-configurable-thread-count.patch
+index 26387f51a5..f1ae73ec4a 100644
+--- a/thirdparty/patches/grpc-configurable-thread-count.patch
++++ b/thirdparty/patches/grpc-configurable-thread-count.patch
+@@ -1,7 +1,6 @@
+-diff --git src/core/lib/gpr/linux/cpu.cc b/src/core/lib/gpr/linux/cpu.cc
+-index 670ca6551c..043021dc4a 100644
+---- src/core/lib/gpr/linux/cpu.cc
+-+++ src/core/lib/gpr/linux/cpu.cc
++diff --git src/core/util/linux/cpu.cc src/core/util/linux/cpu.cc
++--- src/core/util/linux/cpu.cc
+++++ src/core/util/linux/cpu.cc
+ @@ -24,6 +24,7 @@
+  
+  #ifdef GPR_CPU_LINUX
+@@ -10,7 +9,7 @@ index 670ca6551c..043021dc4a 100644
+  #include <errno.h>
+  #include <sched.h>
+  #include <string.h>
+-@@ -49,7 +50,17 @@ static void init_num_cpus() {
++@@ -50,7 +51,17 @@ static void init_num_cpus() {
+  #endif
+    // This must be signed. sysconf returns -1 when the number cannot be
+    // determined
+@@ -27,5 +26,5 @@ index 670ca6551c..043021dc4a 100644
+ +      ncpus = static_cast<int>(sysconf(_SC_NPROCESSORS_CONF));
+ +  }
+    if (ncpus < 1) {
+-     gpr_log(GPR_ERROR, "Cannot determine number of CPUs: assuming 1");
++     LOG(ERROR) << "Cannot determine number of CPUs: assuming 1";
+      ncpus = 1;
 -- 
 2.39.5 (Apple Git-154)
 
diff --git a/recipe/patches/0012-update-patch-for-grpc-1.67.patch b/recipe/patches/0012-update-patch-for-grpc-1.67.patch
