Skip to content

Commit 9186a09

Browse files
mkuratczykmergify[bot]
authored andcommitted
Update CSV to 3.0.5;; remove unused dep
(cherry picked from commit fb36556) (cherry picked from commit 4be83b3)
1 parent 1ef368c commit 9186a09

File tree

7 files changed

+20
-50
lines changed

7 files changed

+20
-50
lines changed

MODULE.bazel

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ erlang_package.hex_package(
179179
erlang_package.hex_package(
180180
name = "csv",
181181
build_file = "@rabbitmq-server//bazel:BUILD.csv",
182-
sha256 = "54508938ac67e27966b10ef49606e3ad5995d665d7fc2688efb3eab1307c9079",
183-
version = "2.4.1",
182+
sha256 = "cbbe5455c93df5f3f2943e995e28b7a8808361ba34cf3e44267d77a01eaf1609",
183+
version = "3.0.5",
184184
)
185185

186186
erlang_package.hex_package(
@@ -266,13 +266,6 @@ sed -i"_orig" -E '/VERSION/ s/[0-9]+\\.[0-9]+\\.[0-9]+/'${VERSION}'/' BUILD.baze
266266
tag = "v1.4.3",
267267
)
268268

269-
erlang_package.hex_package(
270-
name = "parallel_stream",
271-
build_file = "@rabbitmq-server//bazel:BUILD.parallel_stream",
272-
sha256 = "639b2e8749e11b87b9eb42f2ad325d161c170b39b288ac8d04c4f31f8f0823eb",
273-
version = "1.0.6",
274-
)
275-
276269
erlang_package.hex_package(
277270
name = "prometheus",
278271
build_file = "@rabbitmq-server//bazel:BUILD.prometheus",
@@ -367,7 +360,6 @@ use_repo(
367360
"json",
368361
"observer_cli",
369362
"osiris",
370-
"parallel_stream",
371363
"prometheus",
372364
"ra",
373365
"ranch",

bazel/BUILD.csv

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")
2+
13
filegroup(
24
name = "sources",
35
srcs = [
@@ -8,3 +10,17 @@ filegroup(
810
]),
911
visibility = ["//visibility:public"],
1012
)
13+
14+
erlc_opts(
15+
name = "erlc_opts",
16+
values = select({
17+
"@rules_erlang//:debug_build": [
18+
"+debug_info",
19+
],
20+
"//conditions:default": [
21+
"+debug_info",
22+
"+deterministic",
23+
],
24+
}),
25+
visibility = [":__subpackages__"],
26+
)

bazel/BUILD.parallel_stream

Lines changed: 0 additions & 10 deletions
This file was deleted.

deps/rabbitmq_cli/BUILD.bazel

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,11 @@ load(
1010
"mix_archive_build",
1111
)
1212

13-
mix_archive_build(
14-
name = "parallel_stream_ez",
15-
srcs = ["@parallel_stream//:sources"],
16-
out = "parallel_stream.ez",
17-
archives = ["@hex//:archive"],
18-
)
19-
2013
mix_archive_build(
2114
name = "csv_ez",
2215
srcs = ["@csv//:sources"],
2316
out = "csv.ez",
2417
archives = ["@hex//:archive"],
25-
ez_deps = [
26-
":parallel_stream_ez",
27-
],
2818
)
2919

3020
mix_archive_build(
@@ -49,8 +39,7 @@ rabbitmqctl(
4939
license_files = glob(["LICENSE*"]),
5040
source_deps = {
5141
"@csv//:sources": "csv",
52-
"@json//:sources": "json",
53-
"@parallel_stream//:sources": "parallel_stream", # transitive dep of csv 2.x
42+
"@json//:sources": "json"
5443
},
5544
visibility = ["//visibility:public"],
5645
deps = [
@@ -113,7 +102,6 @@ plt(
113102
"runtime_tools",
114103
],
115104
ez_deps = [
116-
":parallel_stream_ez",
117105
":csv_ez",
118106
":json_ez",
119107
],
@@ -159,7 +147,6 @@ rabbitmqctl_test(
159147
"@csv//:sources": "csv",
160148
"@dialyxir//:sources": "dialyxir",
161149
"@json//:sources": "json",
162-
"@parallel_stream//:sources": "parallel_stream", # transitive dep of csv 2.x
163150
"@temp//:sources": "temp",
164151
"@x509//:sources": "x509",
165152
},

deps/rabbitmq_cli/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
PROJECT = rabbitmq_cli
22

33
BUILD_DEPS = rabbit_common
4-
DEPS = csv json observer_cli parallel_stream stdout_formatter
4+
DEPS = csv json observer_cli stdout_formatter
55
TEST_DEPS = amqp amqp_client dialyxir temp x509 rabbit
66

77
dep_amqp = hex 2.1.1
88
dep_csv = hex 2.4.1
99
dep_dialyxir = hex 0.5.1
10-
dep_parallel_stream = hex 1.0.6
1110
dep_json = hex 1.4.1
1211
dep_temp = hex 0.4.7
1312
dep_x509 = hex 0.7.0

deps/rabbitmq_cli/mix.exs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ defmodule RabbitMQCtl.MixfileBase do
147147
:csv,
148148
path: Path.join(deps_dir, "csv")
149149
},
150-
{
151-
:parallel_stream,
152-
path: Path.join(deps_dir, "parallel_stream"), override: true
153-
},
154150
{
155151
:stdout_formatter,
156152
path: Path.join(deps_dir, "stdout_formatter"),

dist.bzl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -351,23 +351,13 @@ def source_archive(
351351
prefix = "deps/csv",
352352
)
353353

354-
pkg_files(
355-
name = "parallel_stream-files",
356-
srcs = [
357-
"@parallel_stream//:sources",
358-
],
359-
strip_prefix = "",
360-
prefix = "deps/parallel_stream",
361-
)
362-
363354
pkg_tar(
364355
name = name,
365356
extension = "tar.xz",
366357
srcs = [
367358
":deps-files",
368359
":json-files",
369360
":csv-files",
370-
":parallel_stream-files",
371361
Label("@rabbitmq-server//:root-licenses"),
372362
],
373363
visibility = ["//visibility:public"],

0 commit comments

Comments
 (0)