diff --git a/Cargo.lock b/Cargo.lock index ff4a611e01..4443676e34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1016,7 +1016,7 @@ dependencies = [ "fnv", "html-escape", "image", - "indexmap 1.9.3", + "indexmap 2.0.0", "lazy_static", "log", "ndarray", @@ -1789,7 +1789,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -1800,6 +1799,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 692a8c2cb9..808e9b1d12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,6 +64,7 @@ members = [ bytes = "1.4.0" futures = "0.3.28" html-escape = "0.2.13" +indexmap = "2.0.0" num-derive = "0.3.3" num-traits = "0.2" prettytable-rs = "0.10" diff --git a/src/daft-core/Cargo.toml b/src/daft-core/Cargo.toml index 584e6b5206..bf9018e28b 100644 --- a/src/daft-core/Cargo.toml +++ b/src/daft-core/Cargo.toml @@ -8,6 +8,7 @@ common-error = {path = "../common/error", default-features = false} dyn-clone = "1.0.12" fnv = "1.0.7" html-escape = {workspace = true} +indexmap = {workspace = true, features = ["serde"]} lazy_static = {workspace = true} log = {workspace = true} ndarray = "0.15.6" @@ -25,10 +26,6 @@ default-features = false features = ["gif", "jpeg", "ico", "png", "tiff", "webp", "bmp", "hdr"] version = "0.24.7" -[dependencies.indexmap] -features = ["serde"] -version = "1.9.2" - [dependencies.numpy] optional = true version = "0.19" diff --git a/src/daft-core/src/schema.rs b/src/daft-core/src/schema.rs index b8d010d919..8522ee6c1f 100644 --- a/src/daft-core/src/schema.rs +++ b/src/daft-core/src/schema.rs @@ -16,7 +16,7 @@ pub type SchemaRef = Arc; #[derive(Debug, PartialEq, Serialize, Deserialize)] #[serde(transparent)] pub struct Schema { - #[serde(with = "indexmap::serde_seq")] + #[serde(with = "indexmap::map::serde_seq")] pub fields: indexmap::IndexMap, } diff --git a/src/daft-plan/Cargo.toml b/src/daft-plan/Cargo.toml index 593b24651b..556b192797 100644 --- a/src/daft-plan/Cargo.toml +++ b/src/daft-plan/Cargo.toml @@ -6,7 +6,7 @@ daft-core = {path = "../daft-core", default-features = false} daft-dsl = {path = "../daft-dsl", default-features = false} daft-io = {path = "../daft-io", default-features = false} daft-table = {path = "../daft-table", default-features = false} -indexmap = "2.0.0" +indexmap = {workspace = true} pyo3 = {workspace = true, optional = true} serde = {workspace = true, features = ["rc"]}