lint

ray-project · May 5, 2024 · fd7ea88 · fd7ea88
1 parent 774e08b
commit fd7ea88
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 36 deletions.
diff --git a/scripts/install-ray.sh b/scripts/install-ray.sh
@@ -2,7 +2,7 @@
 
 minor_version=`python -c "import sys;print(sys.version_info[1])"`
 
-python -m pip install ray
+python -m pip install -U ray
 # if [ "$minor_version" == "8" ] ; then
 # 	python -m pip install https://ray-mobius-us.oss-us-west-1.aliyuncs.com/ci/linux/ubuntu/b7d148815e427ccd47046d1c69ee3ab55bf7db3c/ray-2.0.0.dev0-cp38-cp38-linux_x86_64.whl
 # elif [ "$minor_version" == "7" ] ; then

diff --git a/streaming/java/BUILD.bazel b/streaming/java/BUILD.bazel
@@ -45,28 +45,28 @@ define_java_module(
         ":io_ray_ray_streaming-common",
         "@maven//:org_testng_testng",
         "@ray_streaming_maven//:com_google_guava_guava",
-        ],
+    ],
     visibility = ["//visibility:public"],
     deps = [
         "@maven//:org_apache_logging_log4j_log4j_api",
         "@maven//:org_apache_logging_log4j_log4j_core",
         "@maven//:org_apache_logging_log4j_log4j_slf4j_impl",
         "@maven//:org_slf4j_slf4j_api",
         "@maven//:org_testng_testng",
-        "@ray_streaming_maven//:io_ray_ray_api",
-        "@ray_streaming_maven//:io_ray_ray_runtime",
-        "@ray_streaming_maven//:com_google_guava_guava",
         "@ray_streaming_maven//:com_esotericsoftware_kryo",
         "@ray_streaming_maven//:com_esotericsoftware_minlog_minlog",
         "@ray_streaming_maven//:com_esotericsoftware_reflectasm_reflectasm",
-        "@ray_streaming_maven//:de_ruedigermoeller_fst",
+        "@ray_streaming_maven//:com_google_guava_guava",
         "@ray_streaming_maven//:com_typesafe_config",
+        "@ray_streaming_maven//:commons_io_commons_io",
         "@ray_streaming_maven//:de_javakaffee_kryo_serializers",
-        "@ray_streaming_maven//:org_aeonbits_owner_owner",
-        "@ray_streaming_maven//:org_apache_commons_commons_lang3",
+        "@ray_streaming_maven//:de_ruedigermoeller_fst",
+        "@ray_streaming_maven//:io_ray_ray_api",
+        "@ray_streaming_maven//:io_ray_ray_runtime",
         "@ray_streaming_maven//:joda_time_joda_time",
-        "@ray_streaming_maven//:commons_io_commons_io",
         "@ray_streaming_maven//:net_java_dev_jna_jna",
+        "@ray_streaming_maven//:org_aeonbits_owner_owner",
+        "@ray_streaming_maven//:org_apache_commons_commons_lang3",
         "@ray_streaming_maven//:org_objenesis_objenesis",
     ],
 )
@@ -89,13 +89,13 @@ define_java_module(
         "@maven//:org_apache_logging_log4j_log4j_core",
         "@maven//:org_apache_logging_log4j_log4j_slf4j_impl",
         "@maven//:org_slf4j_slf4j_api",
-        "@ray_streaming_maven//:com_google_guava_guava",
         "@ray_streaming_maven//:com_esotericsoftware_kryo",
         "@ray_streaming_maven//:com_esotericsoftware_minlog_minlog",
         "@ray_streaming_maven//:com_esotericsoftware_reflectasm_reflectasm",
+        "@ray_streaming_maven//:com_google_guava_guava",
         "@ray_streaming_maven//:de_javakaffee_kryo_serializers",
-        "@ray_streaming_maven//:org_apache_commons_commons_lang3",
         "@ray_streaming_maven//:org_aeonbits_owner_owner",
+        "@ray_streaming_maven//:org_apache_commons_commons_lang3",
         "@ray_streaming_maven//:org_objenesis_objenesis",
     ],
 )
@@ -104,8 +104,8 @@ define_java_module(
     name = "streaming-api",
     define_test_lib = True,
     test_deps = [
-        ":io_ray_ray_streaming-common",
         ":io_ray_ray_streaming-api",
+        ":io_ray_ray_streaming-common",
         "@maven//:org_slf4j_slf4j_api",
         "@maven//:org_testng_testng",
         "@ray_streaming_maven//:com_google_guava_guava",
@@ -119,14 +119,14 @@ define_java_module(
         "@maven//:org_apache_logging_log4j_log4j_core",
         "@maven//:org_apache_logging_log4j_log4j_slf4j_impl",
         "@maven//:org_slf4j_slf4j_api",
-        "@ray_streaming_maven//:io_ray_ray_api",
-        "@ray_streaming_maven//:io_ray_ray_runtime",
-        "@ray_streaming_maven//:com_google_guava_guava",
         "@ray_streaming_maven//:com_google_code_findbugs_jsr305",
         "@ray_streaming_maven//:com_google_code_gson_gson",
-        "@ray_streaming_maven//:org_ow2_asm_asm",
-        "@ray_streaming_maven//:org_apache_commons_commons_lang3",
+        "@ray_streaming_maven//:com_google_guava_guava",
+        "@ray_streaming_maven//:io_ray_ray_api",
+        "@ray_streaming_maven//:io_ray_ray_runtime",
         "@ray_streaming_maven//:org_apache_arrow_arrow_vector",
+        "@ray_streaming_maven//:org_apache_commons_commons_lang3",
+        "@ray_streaming_maven//:org_ow2_asm_asm",
     ],
 )
 
@@ -150,43 +150,43 @@ define_java_module(
         "streaming-runtime/src/main/java/io/ray/streaming/runtime/generated/*.java",
     ],
     test_deps = [
-        ":io_ray_ray_streaming-common",
         ":io_ray_ray_streaming-api",
+        ":io_ray_ray_streaming-common",
         ":io_ray_ray_streaming-runtime",
         "@maven//:org_slf4j_slf4j_api",
         "@maven//:org_testng_testng",
-        "@ray_streaming_maven//:io_ray_ray_api",
-        "@ray_streaming_maven//:io_ray_ray_runtime",
         "@ray_streaming_maven//:com_google_guava_guava",
         "@ray_streaming_maven//:de_ruedigermoeller_fst",
+        "@ray_streaming_maven//:io_ray_ray_api",
+        "@ray_streaming_maven//:io_ray_ray_runtime",
+        "@ray_streaming_maven//:org_aeonbits_owner_owner",
         "@ray_streaming_maven//:org_apache_commons_commons_lang3",
         "@ray_streaming_maven//:org_mockito_mockito_all",
-        "@ray_streaming_maven//:org_aeonbits_owner_owner",
         "@ray_streaming_maven//:org_powermock_powermock_api_mockito",
         "@ray_streaming_maven//:org_powermock_powermock_module_testng",
     ],
     visibility = ["//visibility:public"],
     deps = [
-        ":io_ray_ray_streaming-common",
         ":io_ray_ray_streaming-api",
+        ":io_ray_ray_streaming-common",
         ":io_ray_ray_streaming-state",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_apache_logging_log4j_log4j_api",
         "@maven//:org_apache_logging_log4j_log4j_core",
         "@maven//:org_apache_logging_log4j_log4j_slf4j_impl",
         "@maven//:org_msgpack_msgpack_core",
         "@maven//:org_slf4j_slf4j_api",
-        "@ray_streaming_maven//:io_ray_ray_api",
-        "@ray_streaming_maven//:io_ray_ray_runtime",
-        "@ray_streaming_maven//:com_google_guava_guava",
-        "@ray_streaming_maven//:org_apache_commons_commons_lang3",
-        "@ray_streaming_maven//:commons_io_commons_io",
-        "@ray_streaming_maven//:net_java_dev_jna_jna",
         "@ray_streaming_maven//:com_github_davidmoten_flatbuffers_java",
         "@ray_streaming_maven//:com_google_code_findbugs_jsr305",
         "@ray_streaming_maven//:com_google_code_gson_gson",
+        "@ray_streaming_maven//:com_google_guava_guava",
         "@ray_streaming_maven//:commons_collections_commons_collections",
+        "@ray_streaming_maven//:commons_io_commons_io",
+        "@ray_streaming_maven//:io_ray_ray_api",
+        "@ray_streaming_maven//:io_ray_ray_runtime",
+        "@ray_streaming_maven//:net_java_dev_jna_jna",
         "@ray_streaming_maven//:org_aeonbits_owner_owner",
+        "@ray_streaming_maven//:org_apache_commons_commons_lang3",
     ],
 )
 
@@ -196,10 +196,12 @@ java_binary(
     data = ["testng.xml"],
     main_class = "org.testng.TestNG",
     runtime_deps = [
-        ":io_ray_ray_streaming-common_test",
-        ":io_ray_ray_streaming-state_test",
         ":io_ray_ray_streaming-api_test",
+        ":io_ray_ray_streaming-common_test",
         ":io_ray_ray_streaming-runtime_test",
+        ":io_ray_ray_streaming-state_test",
+        "@ray_streaming_maven//:io_ray_ray_api",
+        "@ray_streaming_maven//:io_ray_ray_runtime",
     ],
 )
 
@@ -302,10 +304,10 @@ java_binary(
     # fat jar file. It's not really an executable jar. So we set its `main_class` to empty.
     main_class = "",
     runtime_deps = [
-        "//java:io_ray_ray_streaming-common",
         "//java:io_ray_ray_streaming-api",
-        "//java:io_ray_ray_streaming-state",
+        "//java:io_ray_ray_streaming-common",
         "//java:io_ray_ray_streaming-runtime",
+        "//java:io_ray_ray_streaming-state",
     ],
 )
 

diff --git a/streaming/java/dependencies.bzl b/streaming/java/dependencies.bzl
@@ -29,13 +29,13 @@ def gen_streaming_java_deps():
                 group = "io.ray",
                 artifact = "ray-api",
                 version = "2.11.0",
-                neverlink = True
+                neverlink = True,
             ),
             maven.artifact(
                 group = "io.ray",
                 artifact = "ray-runtime",
                 version = "2.11.0",
-                neverlink = True
+                neverlink = True,
             ),
             maven.artifact(
                 group = "org.apache.arrow",
@@ -44,15 +44,19 @@ def gen_streaming_java_deps():
                 exclusions = [
                     "io.netty:netty-buffer",
                     "io.netty:netty-common",
-                ]
+                ],
             ),
             maven.artifact(
                 group = "de.ruedigermoeller",
                 artifact = "fst",
                 version = "2.56",
                 exclusions = [
+                    maven.exclusion(
+                        group = "com.fasterxml.jackson.core",
+                        artifact = "jackson-core",
+                    ),
                     "com.fasterxml.jackson.core:jackson-core",
-                ]
+                ],
             ),
         ],
         repositories = [