Merge pull request #150 from regro-cf-autotick-bot/2.9.3_h8a7f39

ray-packages v2.9.3
conda-forge · Mar 6, 2024 · 1106aa5 · 1106aa5
2 parents 505c882 + 1f6c096
commit 1106aa5
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 19 deletions.
diff --git a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml
diff --git a/recipe/build-core.bat b/recipe/build-core.bat
@@ -9,9 +9,23 @@ echo ==========================================================
 set BAZEL_VC=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC
 echo dir %BAZEL_VC%
 dir "%BAZEL_VC%"
+echo ----------
 rmdir /q /s "%BAZEL_VC%\vcpkg"
+echo ----------
 echo dir %BAZEL_VC%
 dir "%BAZEL_VC%"
+echo ----------
+
+echo check git
+echo ----------
+where git
+dir %CONDA_PREFIX%\Library\bin /w
+echo ----------
+git --version
+echo ----------
+echo %CONDA_PREFIX%
+python -c "import os; print('\n'.join(os.environ['PATH'].split(';')))"
+echo ----------
 
 echo ==========================================================
 echo calling pip to install

diff --git a/recipe/build-core.sh b/recipe/build-core.sh
@@ -15,6 +15,12 @@ build --define CONDA_SDKROOT=${SDKROOT}
 EOF
 fi
 
+if [[ -e $CONDA_PREFIX/include/crypt.h ]]; then
+    # fix for python3.8 which depends on system includes for crypt.h
+    # but the bazel sandbox does not add it
+    cp $CONDA_PREFIX/include/crypt.h $PREFIX/include/python*
+fi
+
 cd python/
 export SKIP_THIRDPARTY_INSTALL=1
 "${PYTHON}" setup.py build

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,12 +1,12 @@
-{% set version = "2.9.2" %}
+{% set version = "2.9.3" %}
 
 package:
   name: ray-packages
   version: {{ version }}
 
 source:
   url: https://github.com/ray-project/ray/archive/ray-{{ version }}.tar.gz
-  sha256: 27f293471644570c6797e634e0e8abb67c1e9978d614981093b7737c635208ad
+  sha256: 641d0946522cf340799c9b237168be0d9868748d73ab77dc97496b171a41032a
   patches:
     - patches/0001-patch-redis-for-ar-ranlib.patch
     - patches/0002-Disable-making-entry-scripts.patch
@@ -22,9 +22,10 @@ source:
     # xref https://github.com/ray-project/ray/pull/42557
     # xref https://github.com/ray-project/ray/issues/42560
     - patches/0007-remove-bazel-command-line-output-directory-override.patch  # [win]
+    - patches/0008-shallow-clone-fails-on-windows.patch  # [win]
 
 build:
-  number: 1
+  number: 0
 
 # Need these up here for conda-smithy to handle them properly.
 requirements:
@@ -68,6 +69,8 @@ outputs:
         - colorama
         - curl
         - cython >=0.29.32
+        - git =2.33  # [win]
+        - libxcrypt  # [linux and py<39]
         - make
         - m2-bash  # [win]
         - psutil

diff --git a/recipe/patches/0008-shallow-clone-fails-on-windows.patch b/recipe/patches/0008-shallow-clone-fails-on-windows.patch
@@ -0,0 +1,30 @@
+From 28d96ad79637c7f45943ba28d3139b1fdcc47f6d Mon Sep 17 00:00:00 2001
+From: Matti Picus <matti.picus@gmail.com>
+Date: Mon, 4 Mar 2024 15:30:15 +0200
+Subject: [PATCH] shallow-clone-fails-on-windows
+
+---
+ bazel/ray_deps_setup.bzl | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
+index f91eb303c4..f019f8c2c2 100644
+--- a/bazel/ray_deps_setup.bzl
++++ b/bazel/ray_deps_setup.bzl
+@@ -258,13 +258,10 @@ def ray_deps_setup():
+         url = "https://github.com/bazelbuild/rules_foreign_cc/archive/refs/tags/0.9.0.tar.gz",
+     )
+
+-    # Using shallow_since allows the rule to clone down fewer commits.
+-    # Reference:  https://bazel.build/rules/lib/repo/git
+     git_repository(
+         name = "rules_perl",
+         remote = "https://github.com/bazelbuild/rules_perl.git",
+         commit = "022b8daf2bb4836ac7a50e4a1d8ea056a3e1e403",
+-        shallow_since = "1663780239 -0700",
+     )
+
+     http_archive(
+-- 
+2.33.0.windows.2
+