Skip to content

Commit b480ba3

Browse files
bmd3kyatbear
authored andcommitted
build(deps): bump prost* to 0.9.0, tonic to 0.6.2, tonic-reflection to 0.3.0 (tensorflow#5755)
Note: This subsumes tensorflow#5738, which just attempted to update prost-types to 0.8.0. For Reviewers: The only file I modified by hand is Cargo.toml. Everything else is auto-generated from subsequent commands (`cargo update`, `cargo raze`, `bazel run //tensorboard/data/server:update_protos`) tensorflow#5738 attempted to update prost-types from 0.7.0 to 0.8.0. This did not work out-of-the-box for several reasons, the most important of which is that we could not successfully build and run the server with mixed versions of prost (0.7.0), prost-types (0.8.0), and prost-build (0.7.0). This PR attempts to upgrade all three of prost, prost-types, and prost-build to the same version at the same time. We also upgrade tonic, tonic-reflection, and tonic-build so that they, too, depend on the same prost version and we don't have multiple prost crates of different versions. * https://crates.io/crates/prost/0.9.0 * https://crates.io/crates/prost-types/0.9.0 * https://crates.io/crates/prost-build/0.9.0 * https://crates.io/crates/tonic/0.6.2 * https://crates.io/crates/tonic-build/0.6.2 * https://crates.io/crates/tonic-reflection/0.3.0 We choose to upgrade prost to 0.9.0 because, why not? We attempted to upgrade to 0.10.* (the latest version) but these versions of prost have a dependency on cmake, which seems to assume cmake is installed on your machine, which it typically is not within Google. There seems to be some work to further refine the dependency on cmake (tokio-rs/prost#620, tokio-rs/prost#657) so hopefully this gets resolved in a future release of prost and a future upgrade to, say, 0.11 will not have the cmake problems. The upgrade was not straightforward for me, a rust and rustboard newb. Several other edits had to be made and commands had to be run to get it to work. This was the incantation that finally worked for me: * Edit Cargo.toml to update versions of prost, prost-types, prost-build, tonic, tonic-reflection, tonic-build and to update any related raze metadata entries. * Run `cargo update -p prost -p prost-types -p prost-build -p tonic -p tonic-reflection -p tonic-build` * Inspect Cargo.lock and compare to raze metadata entries in Cargo.toml. If any of the versions changed (indexmap) then update the associated raze metadata entry. If any of the crates were removed (none were) then remove the associated raze metadata entry. Also, libc version didn't change but I updated its raze metadata anyway since its version seems to have changed in the past. * Run `cargo raze` * Run `bazel test //tensorboard/data/server:update_protos_test` (especially since this is updating proto-related libraries) and witness it FAIL and then run `bazel run //tensorboard/data/server:update_protos`. * Confirm server works with `bazel run -c opt //tensorboard/data/server -- --logdir <some logdir>`
1 parent 260bf24 commit b480ba3

File tree

58 files changed

+1154
-593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1154
-593
lines changed

tensorboard/data/server/Cargo.lock

Lines changed: 168 additions & 119 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tensorboard/data/server/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ crossbeam = "0.8.0"
3535
env_logger = "0.8.2"
3636
futures-core = "0.3.12"
3737
log = "0.4.11"
38-
prost = "0.7.0"
39-
prost-types = "0.7.0"
38+
prost = "0.9.0"
39+
prost-types = "0.9.0"
4040
rand = "0.7.3"
4141
rand_chacha = "0.2.2"
4242
rayon = "1.5.0"
@@ -46,14 +46,14 @@ serde_json = "1.0.59"
4646
thiserror = "1.0.21"
4747
tokio = { version = "1.8.4", features = ["macros", "rt-multi-thread"] }
4848
tokio-stream = { version = "0.1.2", features = ["net"] }
49-
tonic = "0.4.2"
50-
tonic-reflection = "0.1.0"
49+
tonic = "0.6.2"
50+
tonic-reflection = "0.3.0"
5151
walkdir = "2.3.1"
5252

5353
[dev-dependencies]
54-
prost-build = "0.7.0"
54+
prost-build = "0.9.0"
5555
tempfile = "3.1.0"
56-
tonic-build = "0.4.2"
56+
tonic-build = "0.6.2"
5757

5858
[[bin]]
5959
name = "rustboard"
@@ -86,13 +86,13 @@ targets = [
8686
[package.metadata.raze.crates.crc.'1.8.1']
8787
gen_buildrs = true
8888

89-
[package.metadata.raze.crates.libc.'0.2.80']
89+
[package.metadata.raze.crates.libc.'0.2.126']
9090
gen_buildrs = true
9191

9292
[package.metadata.raze.crates.log.'0.4.11']
9393
gen_buildrs = true
9494

95-
[package.metadata.raze.crates.indexmap.'1.6.0']
95+
[package.metadata.raze.crates.indexmap.'1.8.2']
9696
additional_flags = [
9797
"--cfg=has_std",
9898
]
@@ -109,18 +109,18 @@ additional_flags = [
109109
"--cfg=wrap_proc_macro",
110110
]
111111

112-
[package.metadata.raze.crates.prost-build.'0.7.0']
112+
[package.metadata.raze.crates.prost-build.'0.9.0']
113113
gen_buildrs = true
114114

115115
[package.metadata.raze.crates.ring.'0.16.20']
116116
gen_buildrs = true
117117
data_attr = "glob([\"src/**/*.der\"])"
118118

119-
[package.metadata.raze.crates.tonic-reflection.'0.1.0']
119+
[package.metadata.raze.crates.tonic-reflection.'0.3.0']
120120
gen_buildrs = true
121121
build_data_dependencies = ["@com_google_protobuf//:protoc"]
122122

123-
[package.metadata.raze.crates.tonic-reflection.'0.1.0'.buildrs_additional_environment_variables]
123+
[package.metadata.raze.crates.tonic-reflection.'0.3.0'.buildrs_additional_environment_variables]
124124
PROTOC = "$(execpath @com_google_protobuf//:protoc)"
125125
# We don't have easy access to a rustfmt binary, so make it a no-op.
126126
# https://github.com/bazelbuild/rules_rust/issues/87

tensorboard/data/server/cargo/BUILD.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ alias(
113113

114114
alias(
115115
name = "prost",
116-
actual = "@raze__prost__0_7_0//:prost",
116+
actual = "@raze__prost__0_9_0//:prost",
117117
tags = [
118118
"cargo-raze",
119119
"manual",
@@ -122,7 +122,7 @@ alias(
122122

123123
alias(
124124
name = "prost_build",
125-
actual = "@raze__prost_build__0_7_0//:prost_build",
125+
actual = "@raze__prost_build__0_9_0//:prost_build",
126126
tags = [
127127
"cargo-raze",
128128
"manual",
@@ -131,7 +131,7 @@ alias(
131131

132132
alias(
133133
name = "prost_types",
134-
actual = "@raze__prost_types__0_7_0//:prost_types",
134+
actual = "@raze__prost_types__0_9_0//:prost_types",
135135
tags = [
136136
"cargo-raze",
137137
"manual",
@@ -212,7 +212,7 @@ alias(
212212

213213
alias(
214214
name = "tokio",
215-
actual = "@raze__tokio__1_8_4//:tokio",
215+
actual = "@raze__tokio__1_19_2//:tokio",
216216
tags = [
217217
"cargo-raze",
218218
"manual",
@@ -230,7 +230,7 @@ alias(
230230

231231
alias(
232232
name = "tonic",
233-
actual = "@raze__tonic__0_4_2//:tonic",
233+
actual = "@raze__tonic__0_6_2//:tonic",
234234
tags = [
235235
"cargo-raze",
236236
"manual",
@@ -239,7 +239,7 @@ alias(
239239

240240
alias(
241241
name = "tonic_build",
242-
actual = "@raze__tonic_build__0_4_2//:tonic_build",
242+
actual = "@raze__tonic_build__0_6_2//:tonic_build",
243243
tags = [
244244
"cargo-raze",
245245
"manual",
@@ -248,7 +248,7 @@ alias(
248248

249249
alias(
250250
name = "tonic_reflection",
251-
actual = "@raze__tonic_reflection__0_1_0//:tonic_reflection",
251+
actual = "@raze__tonic_reflection__0_3_0//:tonic_reflection",
252252
tags = [
253253
"cargo-raze",
254254
"manual",

tensorboard/data/server/tensorboard.data.pb.rs

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tensorboard/data/server/tensorboard.pb.rs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)