use bazel tools new jdk deps

ray-project · Mar 24, 2024 · b260975 · b260975
1 parent 15c8d17
commit b260975
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/streaming/BUILD.bazel b/streaming/BUILD.bazel
@@ -514,7 +514,7 @@ cc_binary(
     visibility = ["//visibility:public"],
     deps = [
         ":streaming_lib",
-        "@platforms//tools/jdk:jni",
+        "@bazel_tools//tools/jdk:jni",
     ],
 )
 

diff --git a/streaming/buildtest.sh b/streaming/buildtest.sh
@@ -4,6 +4,12 @@ TMP_LOG_OUTPUT="$script_dir"/tmp/logs
 
 mkdir -p "$TMP_LOG_OUTPUT"
 
+if [[ "$VIRTUAL_ENV" != "" ]]; then
+  INVENV=1
+else
+  INVENV=0
+fi
+
 function suppress_output()
 {
   "$script_dir"/../scripts/suppress_output "$@"
@@ -22,6 +28,12 @@ function create_py_env()
 
 function init()
 {
+    if [ $INVENV = 1 ]
+    then
+        echo "Already in vritual env, reuse $VIRTUAL_ENV"
+        return 0
+    fi
+
     pushd "$script_dir" || exit
     PY3_DIR=$script_dir/../py3
     if [ -d $PY3_DIR ]

diff --git a/streaming/python/setup.py b/streaming/python/setup.py
@@ -31,5 +31,5 @@
     description="streaming module",
     packages=find_packages(),
     package_data={"raystreaming": ["_streaming.so", "jars/raystreaming_dist.jar"]},
-    install_requires=["msgpack>=0.6.2"],
+    install_requires=["msgpack>=0.6.2", "pytest"],
 )