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.

Sign up for GitHub

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

Jump to bottom

Update prost, prost-derive, pbjson, tonic ecosystem #11372

Closed
wants to merge 7 commits into from
Closed

Update prost, prost-derive, pbjson, tonic ecosystem #11372

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f13c8f3
Update prost, prost-derive, pbjson
alamb Jul 9, 2024
c51fd50
udpate more
alamb Jul 9, 2024
839ba91
Merge remote-tracking branch 'apache/main' into alamb/update_prost
alamb Jul 10, 2024
a6cadde
Update datafusion/substrait/Cargo.toml
alamb Jul 10, 2024
e34019b
Merge branch 'alamb/update_prost' of github.com:alamb/datafusion into…
alamb Jul 10, 2024
7900a07
Update vendored code
alamb Jul 10, 2024
5ea5ced
revert upgrade in datafusion-examples until arrow-flight is updated
alamb Jul 10, 2024
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
32 changes: 16 additions & 16 deletions datafusion-cli/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions datafusion-examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ log = { workspace = true }
mimalloc = { version = "0.1", default-features = false }
num_cpus = { workspace = true }
object_store = { workspace = true, features = ["aws", "http"] }
prost = { version = "0.12", default-features = false }
prost = { version = "0.13", default-features = false }
prost-derive = { version = "0.13", default-features = false }
serde = { version = "1.0.136", features = ["derive"] }
serde_json = { workspace = true }
tempfile = { workspace = true }
test-utils = { path = "../test-utils" }
tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot"] }
tonic = "0.11"
tonic = "0.12"
url = { workspace = true }
uuid = "1.7"

Expand Down
4 changes: 2 additions & 2 deletions datafusion/proto-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ arrow = { workspace = true }
chrono = { workspace = true }
datafusion-common = { workspace = true }
object_store = { workspace = true }
pbjson = { version = "0.6.0", optional = true }
prost = "0.12.0"
pbjson = { version = "0.7.0", optional = true }
prost = "0.13.0"
serde = { version = "1.0", optional = true }
serde_json = { workspace = true, optional = true }

Expand Down
4 changes: 2 additions & 2 deletions datafusion/proto-common/gen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ workspace = true

[dependencies]
# Pin these dependencies so that the generated output is deterministic
pbjson-build = "=0.6.2"
prost-build = "=0.12.6"
pbjson-build = "=0.7.0"
prost-build = "=0.13.1"
4 changes: 2 additions & 2 deletions datafusion/proto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ datafusion-common = { workspace = true, default-features = true }
datafusion-expr = { workspace = true }
datafusion-proto-common = { workspace = true }
object_store = { workspace = true }
pbjson = { version = "0.6.0", optional = true }
prost = "0.12.0"
pbjson = { version = "0.7.0", optional = true }
prost = "0.13.0"
serde = { version = "1.0", optional = true }
serde_json = { workspace = true, optional = true }

Expand Down
4 changes: 2 additions & 2 deletions datafusion/proto/gen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ workspace = true

[dependencies]
# Pin these dependencies so that the generated output is deterministic
pbjson-build = "=0.6.2"
prost-build = "=0.12.6"
pbjson-build = "=0.7.0"
prost-build = "=0.13.1"
4 changes: 2 additions & 2 deletions datafusion/substrait/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ chrono = { workspace = true }
datafusion = { workspace = true, default-features = true }
itertools = { workspace = true }
object_store = { workspace = true }
pbjson-types = "0.6"
prost = "0.12"
pbjson-types = "0.7"
prost = "0.13"
substrait = { version = "0.36.0", features = ["serde"] }
alamb marked this conversation as resolved.
Show resolved Hide resolved
url = { workspace = true }

Expand Down
Loading