From 4049468314caf5e67410539e0a1b72eb4b8d5b22 Mon Sep 17 00:00:00 2001 From: Andrew Straw Date: Mon, 23 Dec 2024 15:06:26 +0100 Subject: [PATCH 1/3] force arrow version 53 --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c18fb0f973..018334be47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -113,10 +113,10 @@ ahash = "0.8" memchr = { version = "2.6", optional = true } # Support conversion to/from arrow-rs -arrow-buffer = { version = ">=52", optional = true } -arrow-schema = { version = ">=52", optional = true } -arrow-data = { version = ">=52", optional = true } -arrow-array = { version = ">=52", optional = true } +arrow-buffer = { version = "53", optional = true } +arrow-schema = { version = "53", optional = true } +arrow-data = { version = "53", optional = true } +arrow-array = { version = "53", optional = true } half = { version = "2.2", features = ["bytemuck"] } From d609cc9bedef0cc4d109ce4ad97921bb9a84f2bc Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 28 Dec 2024 12:06:46 +0100 Subject: [PATCH 2/3] Update Cargo.lock --- Cargo.lock | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 453cd9fdb1..1d07178dcd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,9 +87,9 @@ checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" [[package]] name = "arrow-array" -version = "52.2.0" +version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" +checksum = "bd03279cea46569acf9295f6224fbc370c5df184b4d2ecfe97ccb131d5615a7f" dependencies = [ "ahash", "arrow-buffer", @@ -97,15 +97,15 @@ dependencies = [ "arrow-schema", "chrono", "half 2.2.1", - "hashbrown 0.14.3", + "hashbrown 0.15.2", "num", ] [[package]] name = "arrow-buffer" -version = "52.2.0" +version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" +checksum = "9e4a9b9b1d6d7117f6138e13bc4dd5daa7f94e671b70e8c9c4dc37b4f5ecfc16" dependencies = [ "bytes", "half 2.2.1", @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "52.2.0" +version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" +checksum = "e4e75edf21ffd53744a9b8e3ed11101f610e7ceb1a29860432824f1834a1f623" dependencies = [ "arrow-buffer", "arrow-schema", @@ -138,9 +138,9 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "52.2.0" +version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" +checksum = "b95513080e728e4cec37f1ff5af4f12c9688d47795d17cda80b6ec2cf74d4678" [[package]] name = "arrow2" @@ -1138,6 +1138,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "heck" version = "0.3.3" From c9181b770dff5b0926efe742ece2791798993397 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 28 Dec 2024 12:11:17 +0100 Subject: [PATCH 3/3] Accept both arrow 52 and 53 --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 018334be47..cedc7e11d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -113,10 +113,10 @@ ahash = "0.8" memchr = { version = "2.6", optional = true } # Support conversion to/from arrow-rs -arrow-buffer = { version = "53", optional = true } -arrow-schema = { version = "53", optional = true } -arrow-data = { version = "53", optional = true } -arrow-array = { version = "53", optional = true } +arrow-buffer = { version = ">=52, <=53", optional = true } +arrow-schema = { version = ">=52, <=53", optional = true } +arrow-data = { version = ">=52, <=53", optional = true } +arrow-array = { version = ">=52, <=53", optional = true } half = { version = "2.2", features = ["bytemuck"] }