From e7f512e3240a957325b522961bb4ee97cbfe341e Mon Sep 17 00:00:00 2001 From: Lachlan Deakin Date: Thu, 22 Aug 2024 08:14:16 +1000 Subject: [PATCH] Bump maximum supported `ndarray` version from 0.15 to 0.16 (#50) --- CHANGELOG.md | 1 + Cargo.toml | 2 +- src/array.rs | 1 + src/array/codec/array_to_array/transpose.rs | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c96b0a3d..fb8121d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - **Breaking**: `Arc` instead of `Box` partial decoders - Expand `set_partial_values` tests - Specialise `set_partial_values` for `MemoryStore` + - Bump maximum supported `ndarray` version from 0.15 to 0.16 ### Fixed - `[async_]store_set_partial_values` no longer truncates diff --git a/Cargo.toml b/Cargo.toml index 914786bb..4eb12338 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ half = { version = "2.0.0", features = ["bytemuck"] } inventory = "0.3.0" itertools = "0.13.0" monostate = "0.1.0" -ndarray = { version = "0.15.0", optional = true } +ndarray = { version = ">=0.15.0,<17", optional = true } num = { version = "0.4.1" } object_store = { version = ">=0.9.0,<0.11", default-features = false, optional = true } opendal = { version = ">=0.46,<0.50", default-features = false, optional = true } diff --git a/src/array.rs b/src/array.rs index 7ffae4aa..414c5471 100644 --- a/src/array.rs +++ b/src/array.rs @@ -673,6 +673,7 @@ impl Array { #[cfg(feature = "ndarray")] /// Convert an ndarray into a vec with standard layout fn ndarray_into_vec(array: ndarray::Array) -> Vec { + #[allow(deprecated)] if array.is_standard_layout() { array } else { diff --git a/src/array/codec/array_to_array/transpose.rs b/src/array/codec/array_to_array/transpose.rs index be07f002..bab27794 100644 --- a/src/array/codec/array_to_array/transpose.rs +++ b/src/array/codec/array_to_array/transpose.rs @@ -76,6 +76,7 @@ fn transpose_array( // Transpose the data let array_transposed = array.permuted_axes(transpose_order); + #[allow(deprecated)] if array_transposed.is_standard_layout() { Ok(array_transposed.to_owned().into_raw_vec()) } else {