From 4f950303a73ce85afb707742231c8807c2f2dffc Mon Sep 17 00:00:00 2001 From: Gatefixer <313497061+lancedb-gatefixer[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2026 16:18:12 +0000 Subject: [PATCH] fix: satisfy checks for vendored Lance Arrow --- Cargo.toml | 3 +-- python/Cargo.toml | 5 ++--- python/vendor/lance-arrow/Cargo.toml | 24 +++++++++++------------ python/vendor/lance-arrow/src/bfloat16.rs | 1 + python/vendor/lance-arrow/src/deepcopy.rs | 1 + python/vendor/lance-arrow/src/floats.rs | 1 + python/vendor/lance-arrow/src/ipc.rs | 1 + python/vendor/lance-arrow/src/json.rs | 1 + python/vendor/lance-arrow/src/lib.rs | 1 + python/vendor/lance-arrow/src/list.rs | 1 + python/vendor/lance-arrow/src/memory.rs | 1 + python/vendor/lance-arrow/src/scalar.rs | 1 + python/vendor/lance-arrow/src/schema.rs | 1 + python/vendor/lance-arrow/src/stream.rs | 1 + python/vendor/lance-arrow/src/struct.rs | 1 + 15 files changed, 27 insertions(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a097ec8f3..f94710c72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = ["rust/lancedb", "nodejs", "python"] -exclude = ["python/vendor/lance-arrow"] resolver = "2" [workspace.package] @@ -27,7 +26,7 @@ lance-table = { "version" = "=13.0.0-beta.8", "tag" = "v13.0.0-beta.8", "git" = lance-testing = { "version" = "=13.0.0-beta.8", "tag" = "v13.0.0-beta.8", "git" = "https://github.com/lance-format/lance.git" } lance-datafusion = { "version" = "=13.0.0-beta.8", "tag" = "v13.0.0-beta.8", "git" = "https://github.com/lance-format/lance.git" } lance-encoding = { "version" = "=13.0.0-beta.8", "tag" = "v13.0.0-beta.8", "git" = "https://github.com/lance-format/lance.git" } -lance-arrow = { "version" = "=13.0.0-beta.8", "tag" = "v13.0.0-beta.8", "git" = "https://github.com/lance-format/lance.git" } +lance-arrow = { version = "=13.0.0-beta.8", path = "python/vendor/lance-arrow" } lancedb = { path = "rust/lancedb", default-features = false } ahash = "0.8" # Note that this one does not include pyarrow diff --git a/python/Cargo.toml b/python/Cargo.toml index ec730f182..8f0ca3ec0 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -22,9 +22,8 @@ bytes.workspace = true lancedb.workspace = true datafusion-common.workspace = true lance-core.workspace = true -# Make the patched Lance Arrow crate an explicit path dependency so Maturin -# includes it at the path used by the workspace patch in source distributions. -lance-arrow = { version = "=13.0.0-beta.8", path = "vendor/lance-arrow" } +# The workspace path dependency includes the patched crate in Maturin sources. +lance-arrow.workspace = true lance-namespace.workspace = true lance-namespace-impls.workspace = true lance-io.workspace = true diff --git a/python/vendor/lance-arrow/Cargo.toml b/python/vendor/lance-arrow/Cargo.toml index 8b7c96c7a..0e6e0ba91 100644 --- a/python/vendor/lance-arrow/Cargo.toml +++ b/python/vendor/lance-arrow/Cargo.toml @@ -14,20 +14,20 @@ categories = ["database-implementations"] crate-type = ["cdylib", "rlib"] [dependencies] -arrow-array = "58.0.0" -arrow-buffer = "58.0.0" -arrow-data = "58.0.0" -arrow-ipc = { version = "58.0.0", features = ["zstd"] } -arrow-ord = "58.0.0" -arrow-schema = "58.0.0" -arrow-select = "58.0.0" +arrow-array.workspace = true +arrow-buffer.workspace = true +arrow-data.workspace = true +arrow-ipc = { workspace = true, features = ["zstd"] } +arrow-ord.workspace = true +arrow-schema.workspace = true +arrow-select.workspace = true bytemuck = { version = "1", default-features = false, features = ["extern_crate_alloc"] } -bytes = "1.11.1" -futures = "0.3" -half = { version = "2.1", default-features = false, features = ["num-traits", "std", "bytemuck"] } +bytes.workspace = true +futures.workspace = true +half = { workspace = true, features = ["std", "bytemuck"] } jsonb = { version = "0.5.3", default-features = false, features = ["databend"] } -num-traits = "0.2" -rand = { version = "0.9.1", features = ["small_rng"] } +num-traits.workspace = true +rand = { workspace = true, features = ["small_rng"] } [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { version = "0.2", features = ["js"] } diff --git a/python/vendor/lance-arrow/src/bfloat16.rs b/python/vendor/lance-arrow/src/bfloat16.rs index b29b9aa88..1a60e5ece 100644 --- a/python/vendor/lance-arrow/src/bfloat16.rs +++ b/python/vendor/lance-arrow/src/bfloat16.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors //! bfloat16 support for Apache Arrow. diff --git a/python/vendor/lance-arrow/src/deepcopy.rs b/python/vendor/lance-arrow/src/deepcopy.rs index 0d859ef1b..5df4339b5 100644 --- a/python/vendor/lance-arrow/src/deepcopy.rs +++ b/python/vendor/lance-arrow/src/deepcopy.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors use std::sync::Arc; diff --git a/python/vendor/lance-arrow/src/floats.rs b/python/vendor/lance-arrow/src/floats.rs index ad5f37689..0024fbb02 100644 --- a/python/vendor/lance-arrow/src/floats.rs +++ b/python/vendor/lance-arrow/src/floats.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors //! Floats Array diff --git a/python/vendor/lance-arrow/src/ipc.rs b/python/vendor/lance-arrow/src/ipc.rs index 8b6e5cf41..099c362b4 100644 --- a/python/vendor/lance-arrow/src/ipc.rs +++ b/python/vendor/lance-arrow/src/ipc.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors //! Zero-copy Arrow IPC stream read/write utilities. diff --git a/python/vendor/lance-arrow/src/json.rs b/python/vendor/lance-arrow/src/json.rs index 96ede058a..b43777ba2 100644 --- a/python/vendor/lance-arrow/src/json.rs +++ b/python/vendor/lance-arrow/src/json.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors //! JSON support for Apache Arrow. diff --git a/python/vendor/lance-arrow/src/lib.rs b/python/vendor/lance-arrow/src/lib.rs index 777b2ad01..e2e470cd2 100644 --- a/python/vendor/lance-arrow/src/lib.rs +++ b/python/vendor/lance-arrow/src/lib.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors //! Extend Arrow Functionality diff --git a/python/vendor/lance-arrow/src/list.rs b/python/vendor/lance-arrow/src/list.rs index 06b0fc592..750b54c93 100644 --- a/python/vendor/lance-arrow/src/list.rs +++ b/python/vendor/lance-arrow/src/list.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors use std::sync::Arc; diff --git a/python/vendor/lance-arrow/src/memory.rs b/python/vendor/lance-arrow/src/memory.rs index 6b8db9da7..1038a3f91 100644 --- a/python/vendor/lance-arrow/src/memory.rs +++ b/python/vendor/lance-arrow/src/memory.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors use std::collections::HashSet; diff --git a/python/vendor/lance-arrow/src/scalar.rs b/python/vendor/lance-arrow/src/scalar.rs index 6003eb134..412253d12 100644 --- a/python/vendor/lance-arrow/src/scalar.rs +++ b/python/vendor/lance-arrow/src/scalar.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors use arrow_array::{ArrayRef, UInt64Array, make_array}; diff --git a/python/vendor/lance-arrow/src/schema.rs b/python/vendor/lance-arrow/src/schema.rs index 8ce9442b4..0489dd584 100644 --- a/python/vendor/lance-arrow/src/schema.rs +++ b/python/vendor/lance-arrow/src/schema.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors //! Extension to arrow schema diff --git a/python/vendor/lance-arrow/src/stream.rs b/python/vendor/lance-arrow/src/stream.rs index 2d0c57bca..c5e55f093 100644 --- a/python/vendor/lance-arrow/src/stream.rs +++ b/python/vendor/lance-arrow/src/stream.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors //! Utilities for working with streams of [`RecordBatch`]. diff --git a/python/vendor/lance-arrow/src/struct.rs b/python/vendor/lance-arrow/src/struct.rs index 4dee5032b..0e83498cb 100644 --- a/python/vendor/lance-arrow/src/struct.rs +++ b/python/vendor/lance-arrow/src/struct.rs @@ -1,4 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 +// SPDX-FileCopyrightText: Copyright The LanceDB Authors // SPDX-FileCopyrightText: Copyright The Lance Authors //! Extension to arrow struct arrays