From 285abc492a983eaa2bd99a0de294aa9ff90a3043 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 25 Sep 2026 02:19:10 +0000 Subject: [PATCH] cockpit-server: object_store 0.13.2 -> 0.14 to follow lance 12 lance 12 moved to object_store 0.14 (datafusion 54 still carries 0.13 alongside it). The direct dep's own comment claimed it matched the version lance brings in; after the lance 12 bump that stopped being true. body_bake_v4.rs and osm_slab_hydrate.rs (the only users) compile against 0.14 unchanged. The remaining cockpit-server errors are all in osint_gotham.rs (EdgeFacet.in_family/out_family, removed from lance-graph's contract 2026-09-17) and predate this change. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_019HnekoM1EidTwQLS3oFVFm --- Cargo.lock | 33 +++++--------------------------- crates/cockpit-server/Cargo.toml | 6 +++--- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a8a8ba0d..48be37dfa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1720,7 +1720,7 @@ dependencies = [ "memmap2", "ndarray 0.17.2", "notebook-query", - "object_store 0.13.2", + "object_store 0.14.2", "osm-soa-bake", "quarto-core", "quarto-system-runtime", @@ -2756,7 +2756,7 @@ dependencies = [ "hex", "itertools 0.14.0", "log", - "md-5 0.11.0", + "md-5", "memchr", "num-traits", "rand 0.9.4", @@ -6104,16 +6104,6 @@ dependencies = [ "thread-tree", ] -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if 1.0.4", - "digest 0.10.7", -] - [[package]] name = "md-5" version = "0.11.0" @@ -6648,28 +6638,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622acbc9100d3c10e2ee15804b0caa40e55c933d5aa53814cd520805b7958a49" dependencies = [ "async-trait", - "base64 0.22.1", "bytes", "chrono", - "form_urlencoded", "futures-channel", "futures-core", "futures-util", "http 1.4.0", - "http-body-util", "humantime", - "hyper", "itertools 0.14.0", - "md-5 0.10.6", "parking_lot", "percent-encoding", - "quick-xml 0.39.3", - "rand 0.10.1", - "reqwest 0.12.28", - "ring", - "serde", - "serde_json", - "serde_urlencoded", "thiserror 2.0.18", "tokio", "tracing", @@ -6701,7 +6679,7 @@ dependencies = [ "humantime", "hyper", "itertools 0.15.0", - "md-5 0.11.0", + "md-5", "nix", "parking_lot", "percent-encoding", @@ -6852,7 +6830,7 @@ dependencies = [ "http 1.4.0", "jiff", "log", - "md-5 0.11.0", + "md-5", "percent-encoding", "quick-xml 0.41.0", "reqsign-core", @@ -7071,7 +7049,7 @@ dependencies = [ "crc-fast", "http 1.4.0", "log", - "md-5 0.11.0", + "md-5", "opendal-core", "quick-xml 0.41.0", "reqsign-aws-v4", @@ -8723,7 +8701,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "721da970c312655cde9b4ffe0547f20a8494866a4af5ff51f18b7c633d0c870b" dependencies = [ "memchr", - "serde", ] [[package]] diff --git a/crates/cockpit-server/Cargo.toml b/crates/cockpit-server/Cargo.toml index 6cad34981..19e0b535d 100644 --- a/crates/cockpit-server/Cargo.toml +++ b/crates/cockpit-server/Cargo.toml @@ -71,10 +71,10 @@ osm-soa-bake = { path = "../../../openstreetmap-website-rs" } # dependency tree carries one memmap2 version, not two. memmap2 = "0.5" # S3 -> volume hydration for the OSM slab (`osm_slab_hydrate`). `object_store` -# is already in the graph via lance/datafusion at this exact version, so this -# adds no new transitive tree — and its `AmazonS3Builder::from_env()` reads the +# follows lance (lance 12 -> object_store 0.14; datafusion 54 still carries +# 0.13 alongside it), so this adds no new transitive tree — and its `AmazonS3Builder::from_env()` reads the # AWS_* vars directly, so there is no hand-rolled SigV4 here. -object_store = { version = "0.13.2", features = ["aws"] } +object_store = { version = "0.14", features = ["aws"] } sha2 = "0.10" hex = "0.4" futures = "0.3"