Update CSV to 3.0.5;; remove unused dep

charltonliv · May 26, 2023 · fb36556 · fb36556
1 parent 4ea3709
commit fb36556
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 50 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -179,8 +179,8 @@ erlang_package.hex_package(
 erlang_package.hex_package(
     name = "csv",
     build_file = "@rabbitmq-server//bazel:BUILD.csv",
-    sha256 = "54508938ac67e27966b10ef49606e3ad5995d665d7fc2688efb3eab1307c9079",
-    version = "2.4.1",
+    sha256 = "cbbe5455c93df5f3f2943e995e28b7a8808361ba34cf3e44267d77a01eaf1609",
+    version = "3.0.5",
 )
 
 erlang_package.hex_package(
@@ -258,13 +258,6 @@ erlang_package.git_package(
     tag = "v1.5.1",
 )
 
-erlang_package.hex_package(
-    name = "parallel_stream",
-    build_file = "@rabbitmq-server//bazel:BUILD.parallel_stream",
-    sha256 = "639b2e8749e11b87b9eb42f2ad325d161c170b39b288ac8d04c4f31f8f0823eb",
-    version = "1.0.6",
-)
-
 erlang_package.hex_package(
     name = "prometheus",
     build_file = "@rabbitmq-server//bazel:BUILD.prometheus",
@@ -359,7 +352,6 @@ use_repo(
     "json",
     "observer_cli",
     "osiris",
-    "parallel_stream",
     "prometheus",
     "ra",
     "ranch",

diff --git a/bazel/BUILD.csv b/bazel/BUILD.csv
@@ -1,3 +1,5 @@
+load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")
+
 filegroup(
     name = "sources",
     srcs = [
@@ -8,3 +10,17 @@ filegroup(
     ]),
     visibility = ["//visibility:public"],
 )
+
+erlc_opts(
+    name = "erlc_opts",
+    values = select({
+        "@rules_erlang//:debug_build": [
+            "+debug_info",
+        ],
+        "//conditions:default": [
+            "+debug_info",
+            "+deterministic",
+        ],
+    }),
+    visibility = [":__subpackages__"],
+)
diff --git a/bazel/BUILD.parallel_stream b/bazel/BUILD.parallel_stream
diff --git a/deps/rabbitmq_cli/BUILD.bazel b/deps/rabbitmq_cli/BUILD.bazel
@@ -10,21 +10,11 @@ load(
     "mix_archive_build",
 )
 
-mix_archive_build(
-    name = "parallel_stream_ez",
-    srcs = ["@parallel_stream//:sources"],
-    out = "parallel_stream.ez",
-    archives = ["@hex//:archive"],
-)
-
 mix_archive_build(
     name = "csv_ez",
     srcs = ["@csv//:sources"],
     out = "csv.ez",
     archives = ["@hex//:archive"],
-    ez_deps = [
-        ":parallel_stream_ez",
-    ],
 )
 
 mix_archive_build(
@@ -49,8 +39,7 @@ rabbitmqctl(
     license_files = glob(["LICENSE*"]),
     source_deps = {
         "@csv//:sources": "csv",
-        "@json//:sources": "json",
-        "@parallel_stream//:sources": "parallel_stream",  # transitive dep of csv 2.x
+        "@json//:sources": "json"
     },
     visibility = ["//visibility:public"],
     deps = [
@@ -113,7 +102,6 @@ plt(
         "runtime_tools",
     ],
     ez_deps = [
-        ":parallel_stream_ez",
         ":csv_ez",
         ":json_ez",
     ],
@@ -159,7 +147,6 @@ rabbitmqctl_test(
         "@csv//:sources": "csv",
         "@dialyxir//:sources": "dialyxir",
         "@json//:sources": "json",
-        "@parallel_stream//:sources": "parallel_stream",  # transitive dep of csv 2.x
         "@temp//:sources": "temp",
         "@x509//:sources": "x509",
     },

diff --git a/deps/rabbitmq_cli/Makefile b/deps/rabbitmq_cli/Makefile
@@ -1,13 +1,12 @@
 PROJECT = rabbitmq_cli
 
 BUILD_DEPS = rabbit_common
-DEPS = csv json observer_cli parallel_stream stdout_formatter
+DEPS = csv json observer_cli stdout_formatter
 TEST_DEPS = amqp amqp_client dialyxir temp x509 rabbit
 
 dep_amqp = hex 2.1.1
 dep_csv = hex 2.4.1
 dep_dialyxir = hex 0.5.1
-dep_parallel_stream = hex 1.0.6
 dep_json = hex 1.4.1
 dep_temp = hex 0.4.7
 dep_x509 = hex 0.7.0

diff --git a/deps/rabbitmq_cli/mix.exs b/deps/rabbitmq_cli/mix.exs
@@ -146,10 +146,6 @@ defmodule RabbitMQCtl.MixfileBase do
         :csv,
         path: Path.join(deps_dir, "csv")
       },
-      {
-        :parallel_stream,
-        path: Path.join(deps_dir, "parallel_stream"), override: true
-      },
       {
         :stdout_formatter,
         path: Path.join(deps_dir, "stdout_formatter"),

diff --git a/dist.bzl b/dist.bzl
@@ -351,23 +351,13 @@ def source_archive(
         prefix = "deps/csv",
     )
 
-    pkg_files(
-        name = "parallel_stream-files",
-        srcs = [
-            "@parallel_stream//:sources",
-        ],
-        strip_prefix = "",
-        prefix = "deps/parallel_stream",
-    )
-
     pkg_tar(
         name = name,
         extension = "tar.xz",
         srcs = [
             ":deps-files",
             ":json-files",
             ":csv-files",
-            ":parallel_stream-files",
             Label("@rabbitmq-server//:root-licenses"),
         ],
         visibility = ["//visibility:public"],