Skip to content

Commit

Permalink
[CHORE] Unify indexmap versions and bump to 2.0.0 (#1291)
Browse files Browse the repository at this point in the history
Co-authored-by: Xiayue Charles Lin <[email protected]>
  • Loading branch information
xcharleslin and Xiayue Charles Lin committed Aug 23, 2023
1 parent 671e340 commit faaebb6
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 1 addition & 4 deletions src/daft-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/daft-core/src/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub type SchemaRef = Arc<Schema>;
#[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<String, Field>,
}

Expand Down
2 changes: 1 addition & 1 deletion src/daft-plan/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}

Expand Down

0 comments on commit faaebb6

Please sign in to comment.