Update CSV to 3.0.5;; remove unused dep

This commit is contained in:
Michal Kuratczyk 2023-05-25 18:34:51 +02:00
parent 4ea3709d72
commit fb3655610c
No known key found for this signature in database
7 changed files with 20 additions and 50 deletions

View File

@ -179,8 +179,8 @@ erlang_package.hex_package(
erlang_package.hex_package( erlang_package.hex_package(
name = "csv", name = "csv",
build_file = "@rabbitmq-server//bazel:BUILD.csv", build_file = "@rabbitmq-server//bazel:BUILD.csv",
sha256 = "54508938ac67e27966b10ef49606e3ad5995d665d7fc2688efb3eab1307c9079", sha256 = "cbbe5455c93df5f3f2943e995e28b7a8808361ba34cf3e44267d77a01eaf1609",
version = "2.4.1", version = "3.0.5",
) )
erlang_package.hex_package( erlang_package.hex_package(
@ -258,13 +258,6 @@ erlang_package.git_package(
tag = "v1.5.1", 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( erlang_package.hex_package(
name = "prometheus", name = "prometheus",
build_file = "@rabbitmq-server//bazel:BUILD.prometheus", build_file = "@rabbitmq-server//bazel:BUILD.prometheus",
@ -359,7 +352,6 @@ use_repo(
"json", "json",
"observer_cli", "observer_cli",
"osiris", "osiris",
"parallel_stream",
"prometheus", "prometheus",
"ra", "ra",
"ranch", "ranch",

View File

@ -1,3 +1,5 @@
load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")
filegroup( filegroup(
name = "sources", name = "sources",
srcs = [ srcs = [
@ -8,3 +10,17 @@ filegroup(
]), ]),
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )
erlc_opts(
name = "erlc_opts",
values = select({
"@rules_erlang//:debug_build": [
"+debug_info",
],
"//conditions:default": [
"+debug_info",
"+deterministic",
],
}),
visibility = [":__subpackages__"],
)

Can't render this file because it contains an unexpected character in line 2 and column 12.

View File

@ -1,10 +0,0 @@
filegroup(
name = "sources",
srcs = [
"mix.exs",
] + glob([
"LICENSE*",
"lib/**/*",
]),
visibility = ["//visibility:public"],
)

View File

@ -10,21 +10,11 @@ load(
"mix_archive_build", "mix_archive_build",
) )
mix_archive_build(
name = "parallel_stream_ez",
srcs = ["@parallel_stream//:sources"],
out = "parallel_stream.ez",
archives = ["@hex//:archive"],
)
mix_archive_build( mix_archive_build(
name = "csv_ez", name = "csv_ez",
srcs = ["@csv//:sources"], srcs = ["@csv//:sources"],
out = "csv.ez", out = "csv.ez",
archives = ["@hex//:archive"], archives = ["@hex//:archive"],
ez_deps = [
":parallel_stream_ez",
],
) )
mix_archive_build( mix_archive_build(
@ -49,8 +39,7 @@ rabbitmqctl(
license_files = glob(["LICENSE*"]), license_files = glob(["LICENSE*"]),
source_deps = { source_deps = {
"@csv//:sources": "csv", "@csv//:sources": "csv",
"@json//:sources": "json", "@json//:sources": "json"
"@parallel_stream//:sources": "parallel_stream", # transitive dep of csv 2.x
}, },
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
@ -113,7 +102,6 @@ plt(
"runtime_tools", "runtime_tools",
], ],
ez_deps = [ ez_deps = [
":parallel_stream_ez",
":csv_ez", ":csv_ez",
":json_ez", ":json_ez",
], ],
@ -159,7 +147,6 @@ rabbitmqctl_test(
"@csv//:sources": "csv", "@csv//:sources": "csv",
"@dialyxir//:sources": "dialyxir", "@dialyxir//:sources": "dialyxir",
"@json//:sources": "json", "@json//:sources": "json",
"@parallel_stream//:sources": "parallel_stream", # transitive dep of csv 2.x
"@temp//:sources": "temp", "@temp//:sources": "temp",
"@x509//:sources": "x509", "@x509//:sources": "x509",
}, },

View File

@ -1,13 +1,12 @@
PROJECT = rabbitmq_cli PROJECT = rabbitmq_cli
BUILD_DEPS = rabbit_common 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 TEST_DEPS = amqp amqp_client dialyxir temp x509 rabbit
dep_amqp = hex 2.1.1 dep_amqp = hex 2.1.1
dep_csv = hex 2.4.1 dep_csv = hex 2.4.1
dep_dialyxir = hex 0.5.1 dep_dialyxir = hex 0.5.1
dep_parallel_stream = hex 1.0.6
dep_json = hex 1.4.1 dep_json = hex 1.4.1
dep_temp = hex 0.4.7 dep_temp = hex 0.4.7
dep_x509 = hex 0.7.0 dep_x509 = hex 0.7.0

View File

@ -146,10 +146,6 @@ defmodule RabbitMQCtl.MixfileBase do
:csv, :csv,
path: Path.join(deps_dir, "csv") path: Path.join(deps_dir, "csv")
}, },
{
:parallel_stream,
path: Path.join(deps_dir, "parallel_stream"), override: true
},
{ {
:stdout_formatter, :stdout_formatter,
path: Path.join(deps_dir, "stdout_formatter"), path: Path.join(deps_dir, "stdout_formatter"),

View File

@ -351,15 +351,6 @@ def source_archive(
prefix = "deps/csv", prefix = "deps/csv",
) )
pkg_files(
name = "parallel_stream-files",
srcs = [
"@parallel_stream//:sources",
],
strip_prefix = "",
prefix = "deps/parallel_stream",
)
pkg_tar( pkg_tar(
name = name, name = name,
extension = "tar.xz", extension = "tar.xz",
@ -367,7 +358,6 @@ def source_archive(
":deps-files", ":deps-files",
":json-files", ":json-files",
":csv-files", ":csv-files",
":parallel_stream-files",
Label("@rabbitmq-server//:root-licenses"), Label("@rabbitmq-server//:root-licenses"),
], ],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],