diff --git a/Cargo.lock b/Cargo.lock index 1b2828f6..eda7f8a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4533,11 +4533,11 @@ name = "plotium-data" version = "0.2.0" dependencies = [ "arrow", - "chrono-tz", "serde", "serde_json", "sha2 0.10.9", "thiserror 2.0.18", + "tzdb", "uuid", ] @@ -6533,6 +6533,31 @@ dependencies = [ "typify-impl", ] +[[package]] +name = "tz-rs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc6c929ffa10fb34f4a3c7e9a73620a83ef2e85e47f9ec3381b8289e6762f42" + +[[package]] +name = "tzdb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d4e985b6dda743ae7fd4140c28105316ffd75bc58258ee6cc12934e3eb7a0c" +dependencies = [ + "tz-rs", + "tzdb_data", +] + +[[package]] +name = "tzdb_data" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "febaa995f6852367564e16c3369988b99d471d43ed12b1255b8d294661797f1c" +dependencies = [ + "tz-rs", +] + [[package]] name = "uds_windows" version = "1.2.1" @@ -7885,9 +7910,9 @@ dependencies = [ [[package]] name = "zip" -version = "9.0.4" +version = "9.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a954114b47a54df49f83d2722814e86b23d4bb1b54a1b90fb7d92b41619ddc22" +checksum = "6e04976da629d3b04204ba8105b396a193af8ad2583b2c79bfb3ab8af580a11e" dependencies = [ "crc32fast", "flate2", diff --git a/Cargo.toml b/Cargo.toml index 1a148d5c..05887f5a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,9 +35,7 @@ default-members = [ version = "0.2.0" edition = "2024" license = "GPL-3.0-or-later" -authors = ["Jiekang Tian "] publish = false -repository = "https://github.com/nmrtist/plotium" [workspace.dependencies] nmr = "=0.1.3" @@ -64,7 +62,7 @@ futures = "0.3" substrait = { version = "0.63", default-features = false, features = ["serde"] } prost = "0.14" pbjson-types = "0.8" -chrono-tz = "0.10" +tzdb = { version = "0.7", default-features = false } calamine = { version = "0.38", default-features = false, features = ["dates"] } rust_xlsxwriter = { version = "0.100", default-features = false, features = ["constant_memory"] } tokio = { version = "1", features = ["rt"] } @@ -77,7 +75,7 @@ skrifa = { version = "0.44", default-features = false, features = ["std"] } muda = { version = "0.19.3", default-features = false } rfd = "0.17" rhai = { version = "1", features = ["serde", "sync"] } -zip = { version = "9.0", default-features = false, features = ["deflate"] } +zip = { version = "9.0.5", default-features = false, features = ["deflate"] } quick-xml = { version = "0.41", default-features = false } base64 = "0.22" flate2 = { version = "1.1", default-features = false, features = ["rust_backend"] } @@ -110,7 +108,6 @@ windows-sys = { version = "0.61", features = [ plotium-io = { path = "crates/io" } plotium-data = { path = "crates/data" } plotium-datafusion = { path = "crates/datafusion" } -plotium-substrait = { path = "crates/substrait" } plotium-analysis = { path = "crates/analysis" } plotium-processing = { path = "crates/processing" } plotium-figure = { path = "crates/figure" } diff --git a/crates/data/Cargo.toml b/crates/data/Cargo.toml index da635bd8..0d4fa48f 100644 --- a/crates/data/Cargo.toml +++ b/crates/data/Cargo.toml @@ -12,9 +12,9 @@ path = "src/lib.rs" [dependencies] arrow.workspace = true -chrono-tz.workspace = true serde.workspace = true serde_json.workspace = true sha2.workspace = true thiserror.workspace = true +tzdb.workspace = true uuid.workspace = true diff --git a/crates/data/src/schema.rs b/crates/data/src/schema.rs index a919eef8..47cefb1c 100644 --- a/crates/data/src/schema.rs +++ b/crates/data/src/schema.rs @@ -271,7 +271,7 @@ fn validate_logical_type(logical_type: &LogicalType) -> Result<()> { } } LogicalType::Timestamp { display_timezone } - if display_timezone.parse::().is_err() => + if !tzdb::TZ_NAMES.contains(&display_timezone.as_str()) => { return Err(DataError::InvalidSchema(format!( "timestamp display timezone {display_timezone:?} is not an IANA name" diff --git a/deny.toml b/deny.toml index 2225b329..f7912648 100644 --- a/deny.toml +++ b/deny.toml @@ -20,10 +20,9 @@ multiple-versions = "warn" wildcards = "allow" highlight = "simplest-path" deny = [ - # calamine >=0.37 and rust_xlsxwriter >=0.100 now use zip >=9 too. Prevent - # reintroducing the extraction vulnerabilities RUSTSEC-2026-0367/0368/0369 - # through any consumer, including dependencies that only read ZIP streams. - { name = "zip", version = "<9.0.0", reason = "All ZIP consumers must use the patched extraction implementation" }, + # Keep all ZIP consumers above the fixes for RUSTSEC-2026-0367/0368/0369 + # and RUSTSEC-2026-0548, including readers that never extract to disk. + { name = "zip", version = "<9.0.5", reason = "All ZIP consumers must use the patched extraction implementation" }, ] [sources]