From e353cc5b06b0b36e512a609c7407001fca1481a7 Mon Sep 17 00:00:00 2001 From: Martin Obreshkov Date: Thu, 29 Jan 2026 15:15:46 +0200 Subject: [PATCH 1/6] Remove conda --- python/build-wheel-macos.sh | 45 ++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/python/build-wheel-macos.sh b/python/build-wheel-macos.sh index 4abb3c49454e..efea94c6f0d9 100755 --- a/python/build-wheel-macos.sh +++ b/python/build-wheel-macos.sh @@ -12,20 +12,13 @@ NODE_VERSION="14" PY_MMS=("3.9" "3.10" "3.11" "3.12") +VENV_ROOT="$HOME/.ray_venvs" + if [[ -n "${SKIP_DEP_RES}" ]]; then ./ci/env/install-bazel.sh curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash - if [ "$(uname -m)" = "arm64" ]; then - curl -o- https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-arm64.sh | bash - else - curl -o- https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh | bash - fi - - conda init bash - source ~/.bash_profile - # Use the latest version of Node.js in order to build the dashboard. source "$HOME"/.nvm/nvm.sh nvm install $NODE_VERSION @@ -40,25 +33,33 @@ pushd python/ray/dashboard/client popd mkdir -p .whl +mkdir -p "$VENV_ROOT" for ((i=0; i<${#PY_MMS[@]}; ++i)); do PY_MM=${PY_MMS[i]} - CONDA_ENV_NAME="p$PY_MM" - + VENV_NAME="p$PY_MM" + VENV_PATH="$VENV_ROOT/$VENV_NAME" + # The -f flag is passed twice to also run git clean in the arrow subdirectory. # The -d flag removes directories. The -x flag ignores the .gitignore file, # and the -e flag ensures that we don't remove the .whl directory. git clean -f -f -x -d -e .whl -e $DOWNLOAD_DIR -e python/ray/dashboard/client -e dashboard/client - # Install python using conda. This should be easier to produce consistent results in buildkite and locally. - [ ! -f "$HOME/.bash_profile" ] && conda init bash - source ~/.bash_profile - conda create -y -n "$CONDA_ENV_NAME" - conda activate "$CONDA_ENV_NAME" - conda remove -y python || true - conda install -y python="$PY_MM" - # NOTE: We expect conda to set the PATH properly. + # Install the Python version if it doesn’t exist + if ! pyenv versions --bare | grep -q "^$PY_MM$"; then + pyenv install "$PY_MM" + fi + + # Use the exact pyenv-installed Python for the venv + PYTHON_EXE="$(pyenv prefix "$PY_MM")/bin/python" + + # Remove old venv and create new one with the correct Python + rm -rf "$VENV_PATH" + $PYTHON_EXE -m venv "$VENV_PATH" + source "$VENV_PATH/bin/activate" + + # NOTE: venv activates the correct PATH instead. PIP_CMD=pip PYTHON_EXE=python @@ -95,6 +96,8 @@ for ((i=0; i<${#PY_MMS[@]}; ++i)); do popd # cleanup - conda deactivate - conda env remove -y -n "$CONDA_ENV_NAME" + deactivate + rm -rf "$VENV_PATH" done + +pyenv local --unset \ No newline at end of file From 4bb506dffd96041a861fdf167fd1a05f280c5865 Mon Sep 17 00:00:00 2001 From: Martin Obreshkov Date: Fri, 30 Jan 2026 12:18:04 +0200 Subject: [PATCH 2/6] bump bazel to 6.6.0 --- .bazelversion | 2 +- .buildkite/release-automation/verify-macos-wheels.sh | 2 +- WORKSPACE | 4 ++-- release/util/sanity_check_cpp.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bazelversion b/.bazelversion index f22d756da39d..826f5ce030e0 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.5.0 +6.6.0 diff --git a/.buildkite/release-automation/verify-macos-wheels.sh b/.buildkite/release-automation/verify-macos-wheels.sh index 8c2a55da3668..b2932abfeb09 100755 --- a/.buildkite/release-automation/verify-macos-wheels.sh +++ b/.buildkite/release-automation/verify-macos-wheels.sh @@ -15,7 +15,7 @@ if [[ $# -ne 1 ]]; then fi MAC_ARCH="$1" # First argument is the architecture of the machine, e.g. x86_64, arm64 -export USE_BAZEL_VERSION="${USE_BAZEL_VERSION:-6.5.0}" +export USE_BAZEL_VERSION="${USE_BAZEL_VERSION:-6.6.0}" # Sets RAY_VERSION and RAY_COMMIT source .buildkite/release-automation/set-ray-version.sh diff --git a/WORKSPACE b/WORKSPACE index cf7d84bc8883..b7d98b2dc344 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -29,8 +29,8 @@ load("@bazel_skylib//lib:versions.bzl", "versions") # Please keep this in sync with the .bazelversion file. versions.check( - maximum_bazel_version = "6.5.0", - minimum_bazel_version = "6.5.0", + maximum_bazel_version = "6.6.0", + minimum_bazel_version = "6.6.0", ) # Tools to generate `compile_commands.json` to enable awesome tooling of the C language family. diff --git a/release/util/sanity_check_cpp.sh b/release/util/sanity_check_cpp.sh index 568e58ef2954..5e109ed22647 100755 --- a/release/util/sanity_check_cpp.sh +++ b/release/util/sanity_check_cpp.sh @@ -9,5 +9,5 @@ ray cpp --generate-bazel-project-template-to ray-template # Our generated CPP template does not work with bazel 7.x , # so pin the bazel version to 6 - USE_BAZEL_VERSION=6.5.0 bash run.sh + USE_BAZEL_VERSION=6.6.0 bash run.sh ) From 67f13136ba95222b6e5519d89b515bf7f58736e0 Mon Sep 17 00:00:00 2001 From: Martin Obreshkov Date: Mon, 9 Feb 2026 13:47:42 +0200 Subject: [PATCH 3/6] revert bazel bump --- .buildkite/release-automation/verify-macos-wheels.sh | 2 +- WORKSPACE | 4 ++-- release/util/sanity_check_cpp.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.buildkite/release-automation/verify-macos-wheels.sh b/.buildkite/release-automation/verify-macos-wheels.sh index b2932abfeb09..8c2a55da3668 100755 --- a/.buildkite/release-automation/verify-macos-wheels.sh +++ b/.buildkite/release-automation/verify-macos-wheels.sh @@ -15,7 +15,7 @@ if [[ $# -ne 1 ]]; then fi MAC_ARCH="$1" # First argument is the architecture of the machine, e.g. x86_64, arm64 -export USE_BAZEL_VERSION="${USE_BAZEL_VERSION:-6.6.0}" +export USE_BAZEL_VERSION="${USE_BAZEL_VERSION:-6.5.0}" # Sets RAY_VERSION and RAY_COMMIT source .buildkite/release-automation/set-ray-version.sh diff --git a/WORKSPACE b/WORKSPACE index b7d98b2dc344..cf7d84bc8883 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -29,8 +29,8 @@ load("@bazel_skylib//lib:versions.bzl", "versions") # Please keep this in sync with the .bazelversion file. versions.check( - maximum_bazel_version = "6.6.0", - minimum_bazel_version = "6.6.0", + maximum_bazel_version = "6.5.0", + minimum_bazel_version = "6.5.0", ) # Tools to generate `compile_commands.json` to enable awesome tooling of the C language family. diff --git a/release/util/sanity_check_cpp.sh b/release/util/sanity_check_cpp.sh index 5e109ed22647..568e58ef2954 100755 --- a/release/util/sanity_check_cpp.sh +++ b/release/util/sanity_check_cpp.sh @@ -9,5 +9,5 @@ ray cpp --generate-bazel-project-template-to ray-template # Our generated CPP template does not work with bazel 7.x , # so pin the bazel version to 6 - USE_BAZEL_VERSION=6.6.0 bash run.sh + USE_BAZEL_VERSION=6.5.0 bash run.sh ) From c11a03c289492baf9025abba2cde2e0a92b0c5b1 Mon Sep 17 00:00:00 2001 From: Martin Obreshkov Date: Mon, 9 Feb 2026 13:48:48 +0200 Subject: [PATCH 4/6] revert bazel bump --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index 826f5ce030e0..f22d756da39d 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.6.0 +6.5.0 From 99bd4b7a0ffd433e98773420b010d2ca9122ea8e Mon Sep 17 00:00:00 2001 From: Martin Obreshkov Date: Mon, 9 Feb 2026 13:51:30 +0200 Subject: [PATCH 5/6] revert bazel bump --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index f22d756da39d..826f5ce030e0 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.5.0 +6.6.0 From be312d06b3e0e2c5474d2a2faa8cfd136d22671d Mon Sep 17 00:00:00 2001 From: Martin Obreshkov Date: Mon, 9 Feb 2026 13:51:53 +0200 Subject: [PATCH 6/6] revert bazel bump --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index 826f5ce030e0..f22d756da39d 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.6.0 +6.5.0