Skip to content

Commit 6717d3c

Browse files
authored
Merge branch 'main' into github-pages
2 parents 6e9794e + cf5f38a commit 6717d3c

File tree

6 files changed

+16
-24
lines changed

6 files changed

+16
-24
lines changed

Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ debug = true
2626
debug = "line-tables-only"
2727

2828
[workspace.dependencies]
29-
delta_kernel = { version = "=0.6.1", features = ["default-engine"] }
29+
delta_kernel = { version = "=0.6.1", features = ["default-engine-rustls"] }
3030
#delta_kernel = { path = "../delta-kernel-rs/kernel", features = ["sync-engine"] }
3131

3232
# arrow
@@ -45,21 +45,21 @@ object_store = { version = "0.11.2" , features = ["cloud"]}
4545
parquet = { version = "54" }
4646

4747
# datafusion
48-
datafusion = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
49-
datafusion-expr = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
50-
datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
51-
datafusion-ffi = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
52-
datafusion-functions = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
53-
datafusion-functions-aggregate = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
54-
datafusion-physical-expr = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
55-
datafusion-physical-plan = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
56-
datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
57-
datafusion-sql = { git = "https://github.com/apache/arrow-datafusion.git", branch = "branch-45" }
48+
datafusion = "45"
49+
datafusion-expr = "45"
50+
datafusion-common = "45"
51+
datafusion-ffi = "45"
52+
datafusion-functions = "45"
53+
datafusion-functions-aggregate = "45"
54+
datafusion-physical-expr = "45"
55+
datafusion-physical-plan = "45"
56+
datafusion-proto = "45"
57+
datafusion-sql = "45"
5858

5959
# serde
6060
serde = { version = "1.0.194", features = ["derive"] }
6161
serde_json = "1"
62-
strum = { version = "0"}
62+
strum = { version = "0.26"}
6363

6464

6565
# "stdlib"

crates/core/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ strum = { workspace = true}
5454
# "stdlib"
5555
bytes = { workspace = true }
5656
chrono = { workspace = true, default-features = false, features = ["clock"] }
57-
hashbrown = "0.15.2"
5857
regex = { workspace = true }
5958
thiserror = { workspace = true }
6059
uuid = { workspace = true, features = ["serde", "v4"] }

crates/core/src/kernel/snapshot/replay.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use std::collections::HashMap;
2+
use std::collections::HashSet;
23
use std::pin::Pin;
34
use std::sync::Arc;
45
use std::task::Context;
@@ -16,7 +17,6 @@ use delta_kernel::expressions::Scalar;
1617
use delta_kernel::schema::DataType;
1718
use delta_kernel::schema::PrimitiveType;
1819
use futures::Stream;
19-
use hashbrown::HashSet;
2020
use itertools::Itertools;
2121
use percent_encoding::percent_decode_str;
2222
use pin_project_lite::pin_project;

crates/lakefs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ url = { workspace = true }
2828
dashmap = "6"
2929
serde = { workspace = true, features = ["derive"] }
3030
serde_json = { workspace = true }
31-
reqwest = {version = "0.12", features = ["json"]}
31+
reqwest = {version = "0.12", default-features = false, features = ["http2", "json", "rustls-tls-native-roots"]}
3232
http = "1.0.0"
3333
delta_kernel = { workspace = true, features = [] }
3434

dev/publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -xe
44

5-
for crate in "mount" "catalog-glue" "hdfs" "azure" "aws" "gcp" "core" "deltalake"; do
5+
for crate in "core" "mount" "catalog-glue" "catalog-unity" "hdfs" "lakefs" "azure" "aws" "gcp" "deltalake"; do
66
echo ">> Dry-run publishing ${crate}"
77
(cd crates/${crate} && \
88
cargo publish \

python/Cargo.toml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ futures = { workspace = true }
4141
num_cpus = { workspace = true }
4242
tokio = { workspace = true, features = ["rt-multi-thread"] }
4343

44-
# reqwest is pulled in by azure sdk, but not used by python binding itself
45-
# for binary wheel best practice, statically link openssl
46-
reqwest = { version = "*", features = ["native-tls-vendored"] }
47-
4844
deltalake-mount = { path = "../crates/mount" }
4945

5046
# Non-unix or emscripten os
@@ -73,10 +69,7 @@ default = ["rustls"]
7369
native-tls = ["deltalake/s3-native-tls", "deltalake/glue"]
7470
rustls = ["deltalake/s3", "deltalake/glue"]
7571

76-
[build-dependencies]
77-
openssl-src = "=300.3.1"
78-
7972
[profile.release]
8073
opt-level = 3
8174
codegen-units = 1
82-
lto = "fat"
75+
lto = "fat"

0 commit comments

Comments
 (0)