From 4639555912eaf10024695dcd4036b81efd699525 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 19 Jan 2024 04:04:59 +0000 Subject: [PATCH 1/7] updated v2.9.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e04217c3..5704b6cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.9.0" %} +{% set version = "2.9.1" %} package: name: ray-packages @@ -6,7 +6,7 @@ package: source: url: https://github.com/ray-project/ray/archive/ray-{{ version }}.tar.gz - sha256: bebe4413dd1a856cd854308d76d14fb412727b6228bfbdea5f3b5a45ef3f5acc + sha256: e28fbe0f9aa918b394426a68e96b440fafe653b270c3dfab84a4d3680d05f550 patches: - patches/0001-patch-redis-for-ar-ranlib.patch - patches/0002-Disable-making-entry-scripts.patch From d2913cc92fa5cf5ffa7e889276b9e71b3daedadb Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Thu, 18 Jan 2024 23:11:26 -0500 Subject: [PATCH 2/7] Avoid incompatible grpc versions --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5704b6cc..6abc4835 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -155,7 +155,7 @@ outputs: - async-timeout - colorful - gpustat >=1.0.0 - - grpcio + - grpcio >=1.56,!=1.58 - opencensus - prometheus_client >=0.7.1 - py-spy >=0.2.0 From 3bc85bf2dafc1a796f2f1920230be166a19194e4 Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 19 Jan 2024 08:20:27 +0200 Subject: [PATCH 3/7] update patches --- recipe/meta.yaml | 1 - ...emove-all-dependencies-from-setup.py.patch | 2 +- ...i-remove-boost-as-a-dependency-42226.patch | 35 ------------------- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 recipe/patches/0005-ci-remove-boost-as-a-dependency-42226.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6abc4835..66ec86e5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,6 @@ source: - patches/0002-Disable-making-entry-scripts.patch - patches/0003-Ignore-warnings-in-event.cc-and-logging.cc.patch - patches/0004-Remove-all-dependencies-from-setup.py.patch - - patches/0005-ci-remove-boost-as-a-dependency-42226.patch build: number: 0 diff --git a/recipe/patches/0004-Remove-all-dependencies-from-setup.py.patch b/recipe/patches/0004-Remove-all-dependencies-from-setup.py.patch index 1b786c97..9e759b92 100644 --- a/recipe/patches/0004-Remove-all-dependencies-from-setup.py.patch +++ b/recipe/patches/0004-Remove-all-dependencies-from-setup.py.patch @@ -44,7 +44,7 @@ index 4d2fbbd19b..0aa524af1b 100644 - "pydantic!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3", - "prometheus_client >= 0.7.1", - "smart_open", -- "virtualenv >=20.0.24, < 20.21.1", # For pip runtime env. +- "virtualenv >=20.0.24, !=20.21.1", # For pip runtime env. - ], - "client": [ - # The Ray client needs a specific range of gRPC to work: diff --git a/recipe/patches/0005-ci-remove-boost-as-a-dependency-42226.patch b/recipe/patches/0005-ci-remove-boost-as-a-dependency-42226.patch deleted file mode 100644 index 5e4a0dec..00000000 --- a/recipe/patches/0005-ci-remove-boost-as-a-dependency-42226.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 560ff4201ceec40e5b9921b6d1baacfba656e42a Mon Sep 17 00:00:00 2001 -From: Cuong Nguyen <128072568+can-anyscale@users.noreply.github.com> -Date: Mon, 8 Jan 2024 08:07:59 -0800 -Subject: [PATCH] [ci] remove boost as a dependency (#42226) - -The current boost rule is busted in master branch: https://buildkite.com/ray-project/postmerge/builds/2404#018ce49f-f8c1-4518-9d32-868a5a4decc6/176-281. Historically, we need to separate the boost rule from com_github_nelhage_rules_boost since we need a patch. This is no longer the case since #32550. - -Signed-off-by: can ---- - bazel/ray_deps_setup.bzl | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl -index c406ba9281..f91eb303c4 100644 ---- a/bazel/ray_deps_setup.bzl -+++ b/bazel/ray_deps_setup.bzl -@@ -159,15 +159,6 @@ def ray_deps_setup(): - sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44", - ) - -- auto_http_archive( -- # This rule is used by @com_github_nelhage_rules_boost and -- # declaring it here allows us to avoid patching the latter. -- name = "boost", -- build_file = "@com_github_nelhage_rules_boost//:BUILD.boost", -- sha256 = "71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa", -- url = "https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2", -- ) -- - auto_http_archive( - name = "com_github_nelhage_rules_boost", - # If you update the Boost version, remember to update the 'boost' rule. --- -2.34.1 - From 344bdab6cc3f318be51dda39904ad23ec5dd18c8 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Fri, 19 Jan 2024 13:14:43 -0500 Subject: [PATCH 4/7] don't match on any grpc patch version for 1.58 https://github.com/conda/conda/issues/11744 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 66ec86e5..4f60fafb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -154,7 +154,7 @@ outputs: - async-timeout - colorful - gpustat >=1.0.0 - - grpcio >=1.56,!=1.58 + - grpcio >=1.56,!=1.58.* - opencensus - prometheus_client >=0.7.1 - py-spy >=0.2.0 From b239c23ac151ac2f4dec49a1ecf75272cd7449b0 Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 22 Jan 2024 23:46:54 +0200 Subject: [PATCH 5/7] revert pinning --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 15e1016e..2bf83b07 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -161,7 +161,7 @@ outputs: - async-timeout - colorful - gpustat >=1.0.0 - - grpcio >=1.56,!=1.58.* + - grpcio - opencensus - prometheus_client >=0.7.1 - py-spy >=0.2.0 From e1b208e90eabd605191debca46589af8fcf068b8 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 23 Jan 2024 15:49:35 +0200 Subject: [PATCH 6/7] pin grcpio differently --- recipe/meta.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2bf83b07..1fd44527 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,9 @@ source: - patches/0002-Disable-making-entry-scripts.patch - patches/0003-Ignore-warnings-in-event.cc-and-logging.cc.patch - patches/0004-Remove-all-dependencies-from-setup.py.patch + # See https://github.com/conda-forge/ray-packages-feedstock/issues/136 + # Keep in sync with current or active migration of libgrpc to avoid + {% set grpcio_version = "1.59" %} - patches/0006-Vendor-grpc-1.59.3.patch # This patch applies grpc tag v1.59.3 changes from # https://github.com/grpc/grpc/blob/35df344f5e17a9cb290ebf0f5b0f03ddb1ff0a97/bazel/grpc_deps.bzl#L243 @@ -161,7 +164,7 @@ outputs: - async-timeout - colorful - gpustat >=1.0.0 - - grpcio + - grpcio {{ grpcio_version }} - opencensus - prometheus_client >=0.7.1 - py-spy >=0.2.0 @@ -185,7 +188,7 @@ outputs: run: - python - {{ pin_subpackage('ray-core', exact=True) }} - - grpcio + - grpcio {{ grpcio_version }} test: imports: - ray From 478b6f5ebd56105e02a76c2d171c239b76c08d94 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 23 Jan 2024 12:46:00 -0500 Subject: [PATCH 7/7] Improve comment, remove unecessary pins --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1fd44527..c6213ccd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: - patches/0004-Remove-all-dependencies-from-setup.py.patch # See https://github.com/conda-forge/ray-packages-feedstock/issues/136 # Keep in sync with current or active migration of libgrpc to avoid - {% set grpcio_version = "1.59" %} + # ABI breakage - patches/0006-Vendor-grpc-1.59.3.patch # This patch applies grpc tag v1.59.3 changes from # https://github.com/grpc/grpc/blob/35df344f5e17a9cb290ebf0f5b0f03ddb1ff0a97/bazel/grpc_deps.bzl#L243 @@ -164,7 +164,7 @@ outputs: - async-timeout - colorful - gpustat >=1.0.0 - - grpcio {{ grpcio_version }} + - grpcio - opencensus - prometheus_client >=0.7.1 - py-spy >=0.2.0 @@ -188,7 +188,7 @@ outputs: run: - python - {{ pin_subpackage('ray-core', exact=True) }} - - grpcio {{ grpcio_version }} + - grpcio test: imports: - ray