diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 89a0a09a..55bd2959 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index f21cf839..98023ed4 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index 4964d3d4..d2b4cfd8 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.13.____cp313.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml index 923cf4d8..dc850387 100644 --- a/.ci_support/linux_64_python3.13.____cp313.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -21,7 +21,7 @@ docker_image: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index f27b0cd6..3e7cc451 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 77537506..e45e440e 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index c595fdc1..69370a6e 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml index 31b75a47..13aec66c 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 864aeb6a..e2a9fb29 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index b7619741..e80275a0 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index e1dfd8cb..b93777ea 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml index 46a42e16..b7f2ebb0 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index a43e2ad5..bb217a9f 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index d8bb2d99..9a9689b6 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 096f65f3..4099a7e4 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.13.____cp313.yaml b/.ci_support/win_64_python3.13.____cp313.yaml index 8f1e4ef1..0610673e 100644 --- a/.ci_support/win_64_python3.13.____cp313.yaml +++ b/.ci_support/win_64_python3.13.____cp313.yaml @@ -13,7 +13,7 @@ cxx_compiler: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' pin_run_as_build: python: min_pin: x.x diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index f2fcf855..463cbc88 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -53,6 +53,25 @@ if [[ "${sha:-}" == "" ]]; then sha=$(git rev-parse HEAD) fi +if [[ "${OSX_SDK_DIR:-}" == "" ]]; then + if [[ "${CI:-}" == "" ]]; then + echo "Please set OSX_SDK_DIR to a directory where SDKs can be downloaded to. Aborting" + exit 1 + else + export OSX_SDK_DIR=/opt/conda-sdks + /usr/bin/sudo mkdir -p "${OSX_SDK_DIR}" + /usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}" + fi +else + if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then + rm -f "$tmpf" + echo "OSX_SDK_DIR is writeable without sudo, continuing" + else + echo "User-provided OSX_SDK_DIR is not writeable for current user! Aborting" + exit 1 + fi +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup diff --git a/README.md b/README.md index e9b4f8f6..dde87c4a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ About ray-air-feedstock Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/ray-packages-feedstock/blob/main/LICENSE.txt) -Home: https://github.com/ray-project/ray +Home: https://ray.io/ Package license: Apache-2.0 @@ -11,7 +11,7 @@ Summary: Ray is a fast and simple framework for building and running distributed Development: https://github.com/ray-project/ray -Documentation: https://ray.readthedocs.io/ +Documentation: https://docs.ray.io/ Ray is a fast and simple framework for building and running distributed applications. It is split into ray-core, ray-default, diff --git a/pixi.toml b/pixi.toml index 316219d1..091e25a8 100644 --- a/pixi.toml +++ b/pixi.toml @@ -5,7 +5,7 @@ [workspace] name = "ray-packages-feedstock" -version = "3.53.3" # conda-smithy version used to generate this file +version = "3.54.1" # conda-smithy version used to generate this file description = "Pixi configuration for conda-forge/ray-packages-feedstock" authors = ["@conda-forge/ray-packages"] channels = ["conda-forge"] diff --git a/recipe/patches/0003-fake-python-3.9-with-python-3.12.patch b/recipe/patches/0003-fake-python-3.10-with-python-3.12.patch similarity index 58% rename from recipe/patches/0003-fake-python-3.9-with-python-3.12.patch rename to recipe/patches/0003-fake-python-3.10-with-python-3.12.patch index 01e4ea5f..1c0f66b0 100644 --- a/recipe/patches/0003-fake-python-3.9-with-python-3.12.patch +++ b/recipe/patches/0003-fake-python-3.10-with-python-3.12.patch @@ -1,25 +1,26 @@ -From 245f2a37850444d6248357f8091c84c0518a70a8 Mon Sep 17 00:00:00 2001 +From 6335e13634c670dfb8a545fee50dfecb75f4b3d6 Mon Sep 17 00:00:00 2001 From: Lonnie Liu Date: Thu, 27 Nov 2025 02:30:45 +0000 -Subject: [PATCH 3/8] fake python 3.9 with python 3.12 +Subject: [PATCH 3/8] fake python 3.10 with python 3.12 Signed-off-by: Lonnie Liu +Signed-off-by: Lonnie Liu <95255098+aslonnie@users.noreply.github.com> --- WORKSPACE | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE -index ad4fe2ec26..a460922935 100644 +index bf781b5c57..47ecfb835f 100644 --- a/WORKSPACE +++ b/WORKSPACE -@@ -54,8 +54,10 @@ hedron_compile_commands_setup() - load("@rules_python//python:repositories.bzl", "python_register_toolchains") +@@ -60,8 +60,10 @@ python_register_toolchains( + ) python_register_toolchains( + # Lie about the version, so that we do not need to change the code + # of the entire repo. - name = "python3_9", -- python_version = "3.9", + name = "python3_10", +- python_version = "3.10", + python_version = "3.12", register_toolchains = False, ) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index cde64647..19b63f20 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -2,7 +2,7 @@ schema_version: 1 context: - version: "2.52.1" + version: "2.53.0" recipe: name: ray-packages @@ -10,11 +10,11 @@ recipe: source: url: https://github.com/ray-project/ray/archive/ray-${{ version }}.tar.gz - sha256: b00b1db1028be58294e6fc7e649359f3fc0031d07e130b958c95f1e844d3a4ec + sha256: bb2e1393e0617b2edbdbc793718a5dbe98d5024e9f2ab06b33ecc524b02c9e0e patches: - patches/0001-Disable-making-entry-scripts.patch - patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch - - patches/0003-fake-python-3.9-with-python-3.12.patch + - patches/0003-fake-python-3.10-with-python-3.12.patch # See https://github.com/conda-forge/ray-packages-feedstock/issues/136 # Keep in sync with current or active migration of libgrpc to avoid # ABI breakage @@ -87,8 +87,7 @@ outputs: - setproctitle >=1.2.2,<1.4 - if: not win then: unzip - - if: win - then: m2-unzip + else: m2-unzip - if: build_platform != target_platform then: cross-python_${{ target_platform }} host: