Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): Bump what we can from the production group #7996

Merged
merged 2 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 36 additions & 15 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies = [
"termcolor",
"toml 0.5.11",
"tracing",
"tracing-log",
"tracing-log 0.1.4",
"tracing-subscriber",
"wait-timeout",
]
Expand Down Expand Up @@ -2156,6 +2156,15 @@ dependencies = [
"either",
]

[[package]]
name = "itertools"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
dependencies = [
"either",
]

[[package]]
name = "itoa"
version = "1.0.9"
Expand Down Expand Up @@ -3158,9 +3167,9 @@ dependencies = [

[[package]]
name = "prost"
version = "0.12.1"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
dependencies = [
"bytes",
"prost-derive",
Expand Down Expand Up @@ -3190,9 +3199,9 @@ dependencies = [

[[package]]
name = "prost-derive"
version = "0.12.1"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
dependencies = [
"anyhow",
"itertools 0.11.0",
Expand Down Expand Up @@ -4672,11 +4681,12 @@ dependencies = [

[[package]]
name = "tracing-appender"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
dependencies = [
"crossbeam-channel",
"thiserror",
"time",
"tracing-subscriber",
]
Expand Down Expand Up @@ -4755,11 +4765,22 @@ dependencies = [
"tracing-core",
]

[[package]]
name = "tracing-log"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
dependencies = [
"log",
"once_cell",
"tracing-core",
]

[[package]]
name = "tracing-subscriber"
version = "0.3.17"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
dependencies = [
"matchers",
"nu-ansi-term",
Expand All @@ -4770,7 +4791,7 @@ dependencies = [
"thread_local",
"tracing",
"tracing-core",
"tracing-log",
"tracing-log 0.2.0",
]

[[package]]
Expand Down Expand Up @@ -5604,7 +5625,7 @@ dependencies = [
"hex",
"humantime",
"incrementalmerkletree",
"itertools 0.11.0",
"itertools 0.12.0",
"jubjub",
"lazy_static",
"num-integer",
Expand Down Expand Up @@ -5701,7 +5722,7 @@ dependencies = [
"howudoin",
"humantime-serde",
"indexmap 2.1.0",
"itertools 0.11.0",
"itertools 0.12.0",
"lazy_static",
"metrics",
"num-integer",
Expand Down Expand Up @@ -5823,7 +5844,7 @@ dependencies = [
"humantime-serde",
"indexmap 2.1.0",
"insta",
"itertools 0.11.0",
"itertools 0.12.0",
"jubjub",
"lazy_static",
"metrics",
Expand Down Expand Up @@ -5860,7 +5881,7 @@ dependencies = [
"humantime",
"indexmap 2.1.0",
"insta",
"itertools 0.11.0",
"itertools 0.12.0",
"lazy_static",
"once_cell",
"owo-colors",
Expand All @@ -5884,7 +5905,7 @@ version = "1.0.0-beta.31"
dependencies = [
"color-eyre",
"hex",
"itertools 0.11.0",
"itertools 0.12.0",
"regex",
"reqwest",
"serde_json",
Expand Down
6 changes: 6 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ skip-tree = [
{ name = "clap", version = "=2.34.0" },
{ name = "heck", version = "=0.3.3" },

# wait for abscissa_core to upgrade
{name = "tracing-log", version = "=0.1.4" },

# wait for prost to upgrade
{name = "itertools", version = "=0.11.0" },

# Test-only dependencies

# wait for tokio-test -> tokio-stream to upgrade
Expand Down
2 changes: 1 addition & 1 deletion zebra-chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ serde-big-array = "0.5.1"

# Processing
futures = "0.3.29"
itertools = "0.11.0"
itertools = "0.12.0"
rayon = "1.7.0"

# ZF deps
Expand Down
2 changes: 1 addition & 1 deletion zebra-consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ spandoc = "0.2.2"

tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
tracing-error = "0.2.0"
tracing-subscriber = "0.3.17"
tracing-subscriber = "0.3.18"

zebra-state = { path = "../zebra-state", features = ["proptest-impl"] }
zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
Expand Down
2 changes: 1 addition & 1 deletion zebra-network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dirs = "5.0.1"
hex = "0.4.3"
humantime-serde = "1.1.1"
indexmap = { version = "2.0.1", features = ["serde"] }
itertools = "0.11.0"
itertools = "0.12.0"
lazy_static = "1.4.0"
num-integer = "0.1.45"
ordered-map = "0.4.2"
Expand Down
2 changes: 1 addition & 1 deletion zebra-state/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ hex = "0.4.3"
hex-literal = "0.4.1"
humantime-serde = "1.1.1"
indexmap = "2.0.1"
itertools = "0.11.0"
itertools = "0.12.0"
lazy_static = "1.4.0"
metrics = "0.21.1"
mset = "0.1.1"
Expand Down
4 changes: 2 additions & 2 deletions zebra-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ hex = "0.4.3"
indexmap = "2.0.1"
lazy_static = "1.4.0"
insta = "1.33.0"
itertools = "0.11.0"
itertools = "0.12.0"
proptest = "1.4.0"
once_cell = "1.18.0"
rand = "0.8.5"
Expand All @@ -39,7 +39,7 @@ owo-colors = "3.5.0"
spandoc = "0.2.2"
thiserror = "1.0.48"

tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
tracing-error = "0.2.0"
tracing = "0.1.39"

Expand Down
4 changes: 2 additions & 2 deletions zebra-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ structopt = "0.3.26"
hex = "0.4.3"
serde_json = "1.0.108"
tracing-error = "0.2.0"
tracing-subscriber = "0.3.17"
tracing-subscriber = "0.3.18"
thiserror = "1.0.48"

zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.31" }
Expand All @@ -81,7 +81,7 @@ zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.31" }
zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.31", optional = true }

# These crates are needed for the zebra-checkpoints binary
itertools = { version = "0.11.0", optional = true }
itertools = { version = "0.12.0", optional = true }

# These crates are needed for the search-issue-refs binary
regex = { version = "1.10.2", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions zebrad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }

thiserror = "1.0.48"

tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
tracing-appender = "0.2.2"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
tracing-appender = "0.2.3"
tracing-error = "0.2.0"
tracing-futures = "0.2.5"
tracing = "0.1.39"
Expand Down Expand Up @@ -258,7 +258,7 @@ tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
tokio-stream = "0.1.14"

# test feature lightwalletd-grpc-tests
prost = "0.12.1"
prost = "0.12.2"
tonic = "0.10.2"

proptest = "1.4.0"
Expand Down
Loading