From 1c2e7a77d9071f8b4647df74a3a78a45323a0787 Mon Sep 17 00:00:00 2001 From: Ritchie Vink Date: Mon, 5 Sep 2022 10:29:50 +0200 Subject: [PATCH] fix[rust]: fix comparison_and_validity kernels upstream --- polars/polars-arrow/Cargo.toml | 4 ++-- polars/polars-core/Cargo.toml | 8 ++++---- polars/polars-io/Cargo.toml | 4 ++-- py-polars/Cargo.lock | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/polars/polars-arrow/Cargo.toml b/polars/polars-arrow/Cargo.toml index b339024d4583..6e255c783700 100644 --- a/polars/polars-arrow/Cargo.toml +++ b/polars/polars-arrow/Cargo.toml @@ -9,9 +9,9 @@ description = "Arrow interfaces for Polars DataFrame library" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "f34eb9b09fab3d90c9053ab906ce1809ffa62f47", features = ["compute_concatenate"], default-features = false } +# arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "f34eb9b09fab3d90c9053ab906ce1809ffa62f47", features = ["compute_concatenate"], default-features = false } # arrow = { package = "arrow2", path = "../../../arrow2", features = ["compute_concatenate"], default-features = false } -# arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "ipc_meta", features = ["compute_concatenate"], default-features = false } +arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "comparison_and_validity", features = ["compute_concatenate"], default-features = false } # arrow = { package = "arrow2", version = "0.12", default-features = false, features = ["compute_concatenate"] } hashbrown = "0.12" num = "^0.4" diff --git a/polars/polars-core/Cargo.toml b/polars/polars-core/Cargo.toml index 907816bdc9a4..4d77636eb270 100644 --- a/polars/polars-core/Cargo.toml +++ b/polars/polars-core/Cargo.toml @@ -173,11 +173,11 @@ thiserror = "^1.0" [dependencies.arrow] package = "arrow2" -git = "https://github.com/jorgecarleitao/arrow2" -# git = "https://github.com/ritchie46/arrow2" -rev = "f34eb9b09fab3d90c9053ab906ce1809ffa62f47" +# git = "https://github.com/jorgecarleitao/arrow2" +git = "https://github.com/ritchie46/arrow2" +# rev = "f34eb9b09fab3d90c9053ab906ce1809ffa62f47" # path = "../../../arrow2" -# branch = "ipc_meta" +branch = "comparison_and_validity" # version = "0.12" default-features = false features = [ diff --git a/polars/polars-io/Cargo.toml b/polars/polars-io/Cargo.toml index 5741e7f327e9..35c0fc7259ab 100644 --- a/polars/polars-io/Cargo.toml +++ b/polars/polars-io/Cargo.toml @@ -38,8 +38,8 @@ private = ["polars-time/private"] [dependencies] ahash = "0.7" anyhow = "1.0" -arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "f34eb9b09fab3d90c9053ab906ce1809ffa62f47", default-features = false } -# arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "ipc_meta", default-features = false } +# arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "f34eb9b09fab3d90c9053ab906ce1809ffa62f47", default-features = false } +arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "comparison_and_validity", default-features = false } # arrow = { package = "arrow2", version = "0.12", default-features = false } # arrow = { package = "arrow2", path = "../../../arrow2", default-features = false } csv-core = { version = "0.1.10", optional = true } diff --git a/py-polars/Cargo.lock b/py-polars/Cargo.lock index a223fe51e4cb..b43f22491515 100644 --- a/py-polars/Cargo.lock +++ b/py-polars/Cargo.lock @@ -83,7 +83,7 @@ dependencies = [ [[package]] name = "arrow2" version = "0.13.0" -source = "git+https://github.com/jorgecarleitao/arrow2?rev=f34eb9b09fab3d90c9053ab906ce1809ffa62f47#f34eb9b09fab3d90c9053ab906ce1809ffa62f47" +source = "git+https://github.com/ritchie46/arrow2?branch=comparison_and_validity#4c78804f52766ac6f37f227c4d8ed96fd6406900" dependencies = [ "ahash", "arrow-format",