From 84571d1c0b2d9effc270f4b99eb4b18dcb2c09a3 Mon Sep 17 00:00:00 2001 From: zhangfengcdt Date: Thu, 20 Nov 2025 16:57:28 -0700 Subject: [PATCH 1/3] Fix cargo publish error by adding workspace dependencies with versions --- Cargo.lock | 17 ++++----------- Cargo.toml | 29 +++++++++++++++++++++---- c/sedona-geoarrow-c/Cargo.toml | 9 ++++---- c/sedona-geos/Cargo.toml | 13 +++++------ c/sedona-proj/Cargo.toml | 10 ++++----- c/sedona-s2geography/Cargo.toml | 8 +++---- c/sedona-tg/Cargo.toml | 10 ++++----- python/sedonadb/Cargo.toml | 14 ++++++------ r/sedonadb/src/rust/Cargo.toml | 12 +++++----- rust/sedona-adbc/Cargo.toml | 2 +- rust/sedona-datasource/Cargo.toml | 6 ++--- rust/sedona-expr/Cargo.toml | 8 +++---- rust/sedona-functions/Cargo.toml | 10 ++++----- rust/sedona-geo-generic-alg/Cargo.toml | 4 ++-- rust/sedona-geo/Cargo.toml | 16 +++++++------- rust/sedona-geometry/Cargo.toml | 1 - rust/sedona-geoparquet/Cargo.toml | 12 +++++----- rust/sedona-raster-functions/Cargo.toml | 10 ++++----- rust/sedona-raster/Cargo.toml | 4 +--- rust/sedona-schema/Cargo.toml | 2 +- rust/sedona-spatial-join/Cargo.toml | 22 +++++++++---------- rust/sedona-testing/Cargo.toml | 10 ++++----- rust/sedona/Cargo.toml | 28 ++++++++++++------------ sedona-cli/Cargo.toml | 4 ++-- 24 files changed, 131 insertions(+), 130 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45e771cd..fcf1304e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,7 +53,8 @@ dependencies = [ [[package]] name = "adbc_core" version = "0.21.0" -source = "git+https://github.com/apache/arrow-adbc.git#d57cc5013f9e6a38f97c77c05149d9ee5669d46a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a38cdcc3e43dc645038c2b6339dd98610c48ae593cc67839452e6670fa09f27" dependencies = [ "arrow-array", "arrow-schema", @@ -62,7 +63,8 @@ dependencies = [ [[package]] name = "adbc_ffi" version = "0.21.0" -source = "git+https://github.com/apache/arrow-adbc.git#d57cc5013f9e6a38f97c77c05149d9ee5669d46a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d36274376fdc4849cf47a78f3baeef4ae1654ef703dc3148d91adde3336c11" dependencies = [ "adbc_core", "arrow-array", @@ -4921,7 +4923,6 @@ dependencies = [ name = "sedona-expr" version = "0.2.0" dependencies = [ - "arrow-array", "arrow-schema", "datafusion-common", "datafusion-expr", @@ -4931,7 +4932,6 @@ dependencies = [ "sedona-common", "sedona-geometry", "sedona-schema", - "sedona-testing", "serde", "serde_json", ] @@ -5032,7 +5032,6 @@ dependencies = [ "datafusion-expr", "errno", "rstest", - "sedona", "sedona-expr", "sedona-functions", "sedona-schema", @@ -5048,7 +5047,6 @@ dependencies = [ "geo-types", "lru", "rstest", - "sedona-testing", "serde", "serde_json", "serde_with", @@ -5108,7 +5106,6 @@ dependencies = [ "geo-types", "geos", "rstest", - "sedona", "sedona-common", "sedona-expr", "sedona-functions", @@ -5150,9 +5147,7 @@ dependencies = [ "arrow-array", "arrow-buffer", "arrow-schema", - "sedona-common", "sedona-schema", - "sedona-testing", ] [[package]] @@ -5187,9 +5182,7 @@ dependencies = [ "paste", "regex", "rstest", - "sedona", "sedona-expr", - "sedona-functions", "sedona-schema", "sedona-testing", "thiserror 2.0.17", @@ -5286,8 +5279,6 @@ dependencies = [ "datafusion-common", "datafusion-expr", "geo", - "rstest", - "sedona", "sedona-expr", "sedona-functions", "sedona-schema", diff --git a/Cargo.toml b/Cargo.toml index 7fa350f9..2d57b3ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -124,11 +124,32 @@ thiserror = { version = "2" } tokio = { version = "1.44" } url = "2.5.4" -[patch.crates-io] -# Use main branch of arrow-adbc which supports Arrow 56.x (remove when 0.21.0 is released) -adbc_core = { git = "https://github.com/apache/arrow-adbc.git", package = "adbc_core" } -adbc_ffi = { git = "https://github.com/apache/arrow-adbc.git", package = "adbc_ffi" } +# Workspace path dependencies for internal crates +sedona = { version = "0.2.0", path = "rust/sedona" } +sedona-adbc = { version = "0.2.0", path = "rust/sedona-adbc" } +sedona-common = { version = "0.2.0", path = "rust/sedona-common" } +sedona-datasource = { version = "0.2.0", path = "rust/sedona-datasource" } +sedona-expr = { version = "0.2.0", path = "rust/sedona-expr" } +sedona-functions = { version = "0.2.0", path = "rust/sedona-functions" } +sedona-geo = { version = "0.2.0", path = "rust/sedona-geo" } +sedona-geo-generic-alg = { version = "0.2.0", path = "rust/sedona-geo-generic-alg" } +sedona-geo-traits-ext = { version = "0.2.0", path = "rust/sedona-geo-traits-ext" } +sedona-geometry = { version = "0.2.0", path = "rust/sedona-geometry" } +sedona-geoparquet = { version = "0.2.0", path = "rust/sedona-geoparquet" } +sedona-raster = { version = "0.2.0", path = "rust/sedona-raster" } +sedona-raster-functions = { version = "0.2.0", path = "rust/sedona-raster-functions" } +sedona-schema = { version = "0.2.0", path = "rust/sedona-schema" } +sedona-spatial-join = { version = "0.2.0", path = "rust/sedona-spatial-join" } +sedona-testing = { version = "0.2.0", path = "rust/sedona-testing" } + +# C wrapper crates +sedona-geoarrow-c = { version = "0.2.0", path = "c/sedona-geoarrow-c" } +sedona-geos = { version = "0.2.0", path = "c/sedona-geos" } +sedona-proj = { version = "0.2.0", path = "c/sedona-proj", default-features = false } +sedona-s2geography = { version = "0.2.0", path = "c/sedona-s2geography" } +sedona-tg = { version = "0.2.0", path = "c/sedona-tg" } +[patch.crates-io] # TODO: remove them once changes we made to geo-index and wkb crates are merged to upstream and released geo-index = { git = "https://github.com/wherobots/geo-index.git", branch = "main" } wkb = { git = "https://github.com/georust/wkb.git", rev = "3158e6295e4a39dc7fd75f3cfebee113c8b844d0" } diff --git a/c/sedona-geoarrow-c/Cargo.toml b/c/sedona-geoarrow-c/Cargo.toml index f5a26c70..b89ee421 100644 --- a/c/sedona-geoarrow-c/Cargo.toml +++ b/c/sedona-geoarrow-c/Cargo.toml @@ -32,8 +32,7 @@ cc = { version = "1" } [dev-dependencies] criterion = { workspace = true } rstest = { workspace = true } -sedona = { path = "../../rust/sedona" } -sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } +sedona-testing = { workspace = true, features = ["criterion"] } [dependencies] arrow-schema = { workspace = true } @@ -41,9 +40,9 @@ arrow-array = { workspace = true, features = ["ffi"] } datafusion-common = { workspace = true } datafusion-expr = { workspace = true } errno = { version = "0.3" } -sedona-expr = { path = "../../rust/sedona-expr" } -sedona-functions = { path = "../../rust/sedona-functions" } -sedona-schema = { path = "../../rust/sedona-schema" } +sedona-expr = { workspace = true } +sedona-functions = { workspace = true } +sedona-schema = { workspace = true } thiserror = { workspace = true } [[bench]] diff --git a/c/sedona-geos/Cargo.toml b/c/sedona-geos/Cargo.toml index 549a76bd..d627cf3b 100644 --- a/c/sedona-geos/Cargo.toml +++ b/c/sedona-geos/Cargo.toml @@ -28,8 +28,7 @@ rust-version.workspace = true [dev-dependencies] criterion = { workspace = true } -sedona = { path = "../../rust/sedona" } -sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } +sedona-testing = { workspace = true, features = ["criterion"] } rstest = { workspace = true } geo-types = { workspace = true } @@ -39,11 +38,11 @@ arrow-array = { workspace = true } datafusion-common = { workspace = true } datafusion-expr = { workspace = true } geos = { workspace = true } -sedona-common = { path = "../../rust/sedona-common" } -sedona-expr = { path = "../../rust/sedona-expr" } -sedona-functions = { path = "../../rust/sedona-functions" } -sedona-geometry = { path = "../../rust/sedona-geometry" } -sedona-schema = { path = "../../rust/sedona-schema" } +sedona-common = { workspace = true } +sedona-expr = { workspace = true } +sedona-functions = { workspace = true } +sedona-geometry = { workspace = true } +sedona-schema = { workspace = true } geo-traits = { workspace = true } wkb = { workspace = true } byteorder = { workspace = true } diff --git a/c/sedona-proj/Cargo.toml b/c/sedona-proj/Cargo.toml index f54bd52f..bcd0339c 100644 --- a/c/sedona-proj/Cargo.toml +++ b/c/sedona-proj/Cargo.toml @@ -34,7 +34,7 @@ approx = { workspace = true } geo-types = { workspace = true } rstest = { workspace = true } wkb = { workspace = true } -sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } +sedona-testing = { workspace = true, features = ["criterion"] } criterion = { workspace = true} [features] @@ -49,10 +49,10 @@ datafusion-common = { workspace = true } datafusion-expr = { workspace = true } geo-traits = { workspace = true } proj-sys = { version = "0.26.0", optional = true } -sedona-expr = { path = "../../rust/sedona-expr" } -sedona-functions = { path = "../../rust/sedona-functions" } -sedona-geometry = { path = "../../rust/sedona-geometry" } -sedona-schema = { path = "../../rust/sedona-schema" } +sedona-expr = { workspace = true } +sedona-functions = { workspace = true } +sedona-geometry = { workspace = true } +sedona-schema = { workspace = true } thiserror = { workspace = true } wkb = { workspace = true } diff --git a/c/sedona-s2geography/Cargo.toml b/c/sedona-s2geography/Cargo.toml index 77aabffb..b9ad3c5c 100644 --- a/c/sedona-s2geography/Cargo.toml +++ b/c/sedona-s2geography/Cargo.toml @@ -33,8 +33,7 @@ regex = { workspace = true } [dev-dependencies] criterion = { workspace = true } rstest = { workspace = true } -sedona = { path = "../../rust/sedona" } -sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } +sedona-testing = { workspace = true, features = ["criterion"] } [dependencies] arrow-schema = { workspace = true } @@ -42,9 +41,8 @@ arrow-array = { workspace = true, features = ["ffi"] } datafusion-common = { workspace = true } datafusion-expr = { workspace = true } errno = { version = "0.3" } -sedona-expr = { path = "../../rust/sedona-expr" } -sedona-functions = { path = "../../rust/sedona-functions" } -sedona-schema = { path = "../../rust/sedona-schema" } +sedona-expr = { workspace = true } +sedona-schema = { workspace = true } thiserror = { workspace = true } paste = "1.0.15" diff --git a/c/sedona-tg/Cargo.toml b/c/sedona-tg/Cargo.toml index bc29b6bb..cd335f7a 100644 --- a/c/sedona-tg/Cargo.toml +++ b/c/sedona-tg/Cargo.toml @@ -31,9 +31,7 @@ cc = { version = "1" } [dev-dependencies] criterion = { workspace = true } -rstest = { workspace = true } -sedona = { path = "../../rust/sedona" } -sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } +sedona-testing = { workspace = true, features = ["criterion"] } wkb = { workspace = true } geo = { workspace = true } @@ -42,9 +40,9 @@ arrow-schema = { workspace = true } arrow-array = { workspace = true, features = ["ffi"] } datafusion-common = { workspace = true } datafusion-expr = { workspace = true } -sedona-expr = { path = "../../rust/sedona-expr" } -sedona-functions = { path = "../../rust/sedona-functions" } -sedona-schema = { path = "../../rust/sedona-schema" } +sedona-expr = { workspace = true } +sedona-functions = { workspace = true } +sedona-schema = { workspace = true } thiserror = { workspace = true } [[bench]] diff --git a/python/sedonadb/Cargo.toml b/python/sedonadb/Cargo.toml index 939a48e4..16c75a3d 100644 --- a/python/sedonadb/Cargo.toml +++ b/python/sedonadb/Cargo.toml @@ -40,13 +40,13 @@ datafusion-expr = { workspace = true } datafusion-ffi = { workspace = true } futures = { workspace = true } pyo3 = { version = "0.25.1" } -sedona = { path = "../../rust/sedona" } -sedona-adbc = { path = "../../rust/sedona-adbc" } -sedona-expr = { path = "../../rust/sedona-expr" } -sedona-geoparquet = { path = "../../rust/sedona-geoparquet" } -sedona-schema = { path = "../../rust/sedona-schema" } -sedona-proj = { path = "../../c/sedona-proj", default-features = false } -sedona-tg = { path = "../../c/sedona-tg" } +sedona = { workspace = true } +sedona-adbc = { workspace = true } +sedona-expr = { workspace = true } +sedona-geoparquet = { workspace = true } +sedona-schema = { workspace = true } +sedona-proj = { workspace = true } +sedona-tg = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } mimalloc = { workspace = true, optional = true } diff --git a/r/sedonadb/src/rust/Cargo.toml b/r/sedonadb/src/rust/Cargo.toml index ced8c24c..19b4edc7 100644 --- a/r/sedonadb/src/rust/Cargo.toml +++ b/r/sedonadb/src/rust/Cargo.toml @@ -32,11 +32,11 @@ datafusion-expr = { workspace = true } datafusion-ffi = { workspace = true } savvy = "*" savvy-ffi = "*" -sedona = { path = "../../../../rust/sedona" } -sedona-adbc = { path = "../../../../rust/sedona-adbc" } -sedona-expr = { path = "../../../../rust/sedona-expr" } -sedona-geoparquet = { path = "../../../../rust/sedona-geoparquet" } -sedona-proj = { path = "../../../../c/sedona-proj", default-features = false } -sedona-schema = { path = "../../../../rust/sedona-schema" } +sedona = { workspace = true } +sedona-adbc = { workspace = true } +sedona-expr = { workspace = true } +sedona-geoparquet = { workspace = true } +sedona-proj = { workspace = true } +sedona-schema = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } diff --git a/rust/sedona-adbc/Cargo.toml b/rust/sedona-adbc/Cargo.toml index f7796b20..1abf600e 100644 --- a/rust/sedona-adbc/Cargo.toml +++ b/rust/sedona-adbc/Cargo.toml @@ -34,5 +34,5 @@ arrow-array = { workspace = true } arrow-schema = { workspace = true } datafusion = { workspace = true } futures = { workspace = true } -sedona = { path = "../sedona" } +sedona = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread"] } diff --git a/rust/sedona-datasource/Cargo.toml b/rust/sedona-datasource/Cargo.toml index de0dfffe..b939ff41 100644 --- a/rust/sedona-datasource/Cargo.toml +++ b/rust/sedona-datasource/Cargo.toml @@ -45,6 +45,6 @@ datafusion-physical-expr = { workspace = true } datafusion-physical-plan = { workspace = true } futures = { workspace = true } object_store = { workspace = true } -sedona-common = { path = "../sedona-common" } -sedona-expr = { path = "../sedona-expr" } -sedona-schema = { path = "../sedona-schema" } +sedona-common = { workspace = true } +sedona-expr = { workspace = true } +sedona-schema = { workspace = true } diff --git a/rust/sedona-expr/Cargo.toml b/rust/sedona-expr/Cargo.toml index 0cb72603..552c367f 100644 --- a/rust/sedona-expr/Cargo.toml +++ b/rust/sedona-expr/Cargo.toml @@ -28,18 +28,16 @@ rust-version.workspace = true result_large_err = "allow" [dev-dependencies] -sedona-testing = { path = "../sedona-testing" } rstest = { workspace = true } [dependencies] -arrow-array = { workspace = true } arrow-schema = { workspace = true } datafusion-common = { workspace = true } datafusion-expr = { workspace = true } datafusion-physical-expr = { workspace = true } geo-traits = { workspace = true } -sedona-common = { path = "../sedona-common" } -sedona-geometry = { path = "../sedona-geometry" } -sedona-schema = { path = "../sedona-schema" } +sedona-common = { workspace = true } +sedona-geometry = { workspace = true } +sedona-schema = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/rust/sedona-functions/Cargo.toml b/rust/sedona-functions/Cargo.toml index 8c5f409a..8ab2b4cb 100644 --- a/rust/sedona-functions/Cargo.toml +++ b/rust/sedona-functions/Cargo.toml @@ -31,7 +31,7 @@ result_large_err = "allow" arrow-json = { workspace = true } criterion = { workspace = true } rstest = { workspace = true } -sedona-testing = { path = "../sedona-testing", features = ["criterion"] } +sedona-testing = { workspace = true, features = ["criterion"] } datafusion = { workspace = true } tokio = { workspace = true, features = ["rt", "macros"] } @@ -41,10 +41,10 @@ arrow-array = { workspace = true } datafusion-common = { workspace = true } datafusion-expr = { workspace = true } geo-traits = { workspace = true } -sedona-common = { path = "../sedona-common" } -sedona-expr = { path = "../sedona-expr" } -sedona-geometry = { path = "../sedona-geometry" } -sedona-schema = { path = "../sedona-schema" } +sedona-common = { workspace = true } +sedona-expr = { workspace = true } +sedona-geometry = { workspace = true } +sedona-schema = { workspace = true } wkb = { workspace = true } wkt = { workspace = true } serde_json = { workspace = true } diff --git a/rust/sedona-geo-generic-alg/Cargo.toml b/rust/sedona-geo-generic-alg/Cargo.toml index 2cbcd36e..0fc101ee 100644 --- a/rust/sedona-geo-generic-alg/Cargo.toml +++ b/rust/sedona-geo-generic-alg/Cargo.toml @@ -28,7 +28,7 @@ rust-version.workspace = true float_next_after = { workspace = true } geo-traits = { workspace = true } geo-types = { workspace = true, features = ["approx", "use-rstar_0_12"] } -sedona-geo-traits-ext = { path = "../sedona-geo-traits-ext" } +sedona-geo-traits-ext = { workspace = true } log = "0.4.11" num-traits = { workspace = true } robust = "1.1.0" @@ -36,7 +36,7 @@ rstar = "0.12.0" i_overlay = { version = "4.0.0, < 4.1.0", default-features = false } [dev-dependencies] -sedona-testing = { path = "../sedona-testing" } +sedona-testing = { workspace = true } approx = { workspace = true } criterion = { workspace = true } pretty_env_logger = "0.4" diff --git a/rust/sedona-geo/Cargo.toml b/rust/sedona-geo/Cargo.toml index df439182..a3c94c7c 100644 --- a/rust/sedona-geo/Cargo.toml +++ b/rust/sedona-geo/Cargo.toml @@ -30,9 +30,9 @@ result_large_err = "allow" [dev-dependencies] criterion = { workspace = true } rstest = { workspace = true } -sedona-geometry = { path = "../sedona-geometry" } -sedona-schema = { path = "../sedona-schema" } -sedona-testing = { path = "../sedona-testing", features = ["criterion", "geo"] } +sedona-geometry = { workspace = true } +sedona-schema = { workspace = true } +sedona-testing = { workspace = true, features = ["criterion", "geo"] } wkt = { workspace = true } [dependencies] @@ -40,14 +40,14 @@ arrow-schema = { workspace = true } arrow-array = { workspace = true } datafusion-common = { workspace = true } datafusion-expr = { workspace = true } -sedona-geo-generic-alg = { path = "../sedona-geo-generic-alg" } +sedona-geo-generic-alg = { workspace = true } geo-traits = { workspace = true, features = ["geo-types"] } geo-types = { workspace = true } geo = { workspace = true } -sedona-expr = { path = "../sedona-expr" } -sedona-functions = { path = "../sedona-functions" } -sedona-geometry = { path = "../sedona-geometry" } -sedona-schema = { path = "../sedona-schema" } +sedona-expr = { workspace = true } +sedona-functions = { workspace = true } +sedona-geometry = { workspace = true } +sedona-schema = { workspace = true } wkb = { workspace = true } [[bench]] diff --git a/rust/sedona-geometry/Cargo.toml b/rust/sedona-geometry/Cargo.toml index 7d3a45c1..8f127589 100644 --- a/rust/sedona-geometry/Cargo.toml +++ b/rust/sedona-geometry/Cargo.toml @@ -30,7 +30,6 @@ result_large_err = "allow" [dev-dependencies] geo-types = { workspace = true } rstest = { workspace = true } -sedona-testing = { path = "../sedona-testing" } serde_json = { workspace = true } wkt = { workspace = true } diff --git a/rust/sedona-geoparquet/Cargo.toml b/rust/sedona-geoparquet/Cargo.toml index cba3bd52..cdf07935 100644 --- a/rust/sedona-geoparquet/Cargo.toml +++ b/rust/sedona-geoparquet/Cargo.toml @@ -31,7 +31,7 @@ result_large_err = "allow" default = [] [dev-dependencies] -sedona-testing = { path = "../sedona-testing" } +sedona-testing = { workspace = true } url = { workspace = true } rstest = { workspace = true } tempfile = { workspace = true } @@ -56,11 +56,11 @@ geo-traits = { workspace = true } futures = { workspace = true } object_store = { workspace = true } parquet = { workspace = true } -sedona-common = { path = "../sedona-common" } -sedona-expr = { path = "../sedona-expr" } -sedona-functions = { path = "../sedona-functions" } -sedona-geometry = { path = "../sedona-geometry" } -sedona-schema = { path = "../sedona-schema" } +sedona-common = { workspace = true } +sedona-expr = { workspace = true } +sedona-functions = { workspace = true } +sedona-geometry = { workspace = true } +sedona-schema = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } serde_with = { workspace = true } diff --git a/rust/sedona-raster-functions/Cargo.toml b/rust/sedona-raster-functions/Cargo.toml index b674b136..b7ab2298 100644 --- a/rust/sedona-raster-functions/Cargo.toml +++ b/rust/sedona-raster-functions/Cargo.toml @@ -33,14 +33,14 @@ arrow-array = { workspace = true } arrow-buffer = { workspace = true } datafusion-common = { workspace = true } datafusion-expr = { workspace = true } -sedona-common = { path = "../sedona-common" } -sedona-expr = { path = "../sedona-expr" } -sedona-raster = { path = "../sedona-raster" } -sedona-schema = { path = "../sedona-schema" } +sedona-common = { workspace = true } +sedona-expr = { workspace = true } +sedona-raster = { workspace = true } +sedona-schema = { workspace = true } [dev-dependencies] criterion = { workspace = true } -sedona-testing = { path = "../sedona-testing", features = ["criterion"] } +sedona-testing = { workspace = true, features = ["criterion"] } rstest = { workspace = true } [[bench]] diff --git a/rust/sedona-raster/Cargo.toml b/rust/sedona-raster/Cargo.toml index 1a8562f8..5358b9f7 100644 --- a/rust/sedona-raster/Cargo.toml +++ b/rust/sedona-raster/Cargo.toml @@ -31,8 +31,6 @@ result_large_err = "allow" arrow-schema = { workspace = true } arrow-array = { workspace = true } arrow-buffer = { workspace = true } -sedona-common = { path = "../sedona-common" } -sedona-schema = { path = "../sedona-schema" } +sedona-schema = { workspace = true } [dev-dependencies] -sedona-testing = { path = "../sedona-testing" } diff --git a/rust/sedona-schema/Cargo.toml b/rust/sedona-schema/Cargo.toml index 223989df..48b4fd80 100644 --- a/rust/sedona-schema/Cargo.toml +++ b/rust/sedona-schema/Cargo.toml @@ -31,5 +31,5 @@ result_large_err = "allow" arrow-schema = { workspace = true } arrow-array = { workspace = true } datafusion-common = { workspace = true } -sedona-common = { path = "../sedona-common" } +sedona-common = { workspace = true } serde_json = { workspace = true } diff --git a/rust/sedona-spatial-join/Cargo.toml b/rust/sedona-spatial-join/Cargo.toml index d1037145..f06de282 100644 --- a/rust/sedona-spatial-join/Cargo.toml +++ b/rust/sedona-spatial-join/Cargo.toml @@ -45,18 +45,18 @@ futures = { workspace = true } once_cell = { workspace = true } parking_lot = { workspace = true } geo = { workspace = true } -sedona-geo-generic-alg = { path = "../sedona-geo-generic-alg" } +sedona-geo-generic-alg = { workspace = true } geo-traits = { workspace = true, features = ["geo-types"] } -sedona-geo-traits-ext = { path = "../sedona-geo-traits-ext" } +sedona-geo-traits-ext = { workspace = true } geo-types = { workspace = true } -sedona-common = { path = "../sedona-common" } -sedona-expr = { path = "../sedona-expr" } -sedona-functions = { path = "../sedona-functions" } -sedona-geo = { path = "../sedona-geo" } -sedona-geometry = { path = "../sedona-geometry" } -sedona-schema = { path = "../sedona-schema" } -sedona-tg = { path = "../../c/sedona-tg" } -sedona-geos = { path = "../../c/sedona-geos" } +sedona-common = { workspace = true } +sedona-expr = { workspace = true } +sedona-functions = { workspace = true } +sedona-geo = { workspace = true } +sedona-geometry = { workspace = true } +sedona-schema = { workspace = true } +sedona-tg = { workspace = true } +sedona-geos = { workspace = true } wkb = { workspace = true } geo-index = { workspace = true } geos = { workspace = true } @@ -65,7 +65,7 @@ float_next_after = { workspace = true } [dev-dependencies] criterion = { workspace = true } rstest = { workspace = true } -sedona-testing = { path = "../sedona-testing" } +sedona-testing = { workspace = true } wkt = { workspace = true } tokio = { workspace = true, features = ["macros"] } rand = { workspace = true } diff --git a/rust/sedona-testing/Cargo.toml b/rust/sedona-testing/Cargo.toml index fe577501..e3c1696a 100644 --- a/rust/sedona-testing/Cargo.toml +++ b/rust/sedona-testing/Cargo.toml @@ -48,11 +48,11 @@ geo-traits = { workspace = true, features = ["geo-types"] } geo-types = { workspace = true } parquet = { workspace = true, features = ["arrow", "snap", "zstd"] } rand = { workspace = true } -sedona-common = { path = "../sedona-common" } -sedona-geometry = { path = "../sedona-geometry" } -sedona-expr = { path = "../sedona-expr" } -sedona-raster = { path = "../sedona-raster" } -sedona-schema = { path = "../sedona-schema" } +sedona-common = { workspace = true } +sedona-geometry = { workspace = true } +sedona-expr = { workspace = true } +sedona-raster = { workspace = true } +sedona-schema = { workspace = true } wkb = { workspace = true } wkt = { workspace = true } geo = { workspace = true, optional = true } diff --git a/rust/sedona/Cargo.toml b/rust/sedona/Cargo.toml index 66f4324e..d210a9e4 100644 --- a/rust/sedona/Cargo.toml +++ b/rust/sedona/Cargo.toml @@ -62,20 +62,20 @@ geo-traits = { workspace = true } geo-types = { workspace = true } object_store = { workspace = true } parking_lot = { workspace = true } -sedona-common = { path = "../sedona-common" } -sedona-expr = { path = "../sedona-expr" } -sedona-functions = { path = "../sedona-functions" } -sedona-geo = { path = "../sedona-geo", optional = true } -sedona-geometry = { path = "../sedona-geometry" } -sedona-geoparquet = { path = "../sedona-geoparquet" } -sedona-geos = { path = "../../c/sedona-geos", optional = true } -sedona-proj = { path = "../../c/sedona-proj", default-features = false } -sedona-raster-functions = { path = "../../rust/sedona-raster-functions" } -sedona-schema = { path = "../sedona-schema" } -sedona-spatial-join = { path = "../sedona-spatial-join", optional = true } -sedona-s2geography = { path = "../../c/sedona-s2geography", optional = true } -sedona-testing = { path = "../sedona-testing" } -sedona-tg = { path = "../../c/sedona-tg", optional = true } +sedona-common = { workspace = true } +sedona-expr = { workspace = true } +sedona-functions = { workspace = true } +sedona-geo = { workspace = true, optional = true } +sedona-geometry = { workspace = true } +sedona-geoparquet = { workspace = true } +sedona-geos = { workspace = true, optional = true } +sedona-proj = { workspace = true } +sedona-raster-functions = { workspace = true } +sedona-schema = { workspace = true } +sedona-spatial-join = { workspace = true, optional = true } +sedona-s2geography = { workspace = true, optional = true } +sedona-testing = { workspace = true } +sedona-tg = { workspace = true, optional = true } serde = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true } diff --git a/sedona-cli/Cargo.toml b/sedona-cli/Cargo.toml index 08ac0bb1..3c3d1dbb 100644 --- a/sedona-cli/Cargo.toml +++ b/sedona-cli/Cargo.toml @@ -60,6 +60,6 @@ mimalloc = { workspace = true, optional = true } libmimalloc-sys = { workspace = true, optional = true } regex = { workspace = true } rustyline = "15.0" -sedona = { path = "../rust/sedona", features = ["aws", "gcp", "http", "proj"] } -sedona-tg = { path = "../c/sedona-tg" } +sedona = { workspace = true, features = ["aws", "gcp", "http", "proj"] } +sedona-tg = { workspace = true } tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot", "signal"] } From e5cae441a6d640d18329739b798a2e6811d3855b Mon Sep 17 00:00:00 2001 From: zhangfengcdt Date: Fri, 21 Nov 2025 08:58:22 -0700 Subject: [PATCH 2/3] fix clippy error --- Cargo.lock | 10 ++++++++++ c/sedona-geoarrow-c/Cargo.toml | 1 + c/sedona-geos/Cargo.toml | 1 + c/sedona-s2geography/Cargo.toml | 2 ++ c/sedona-tg/Cargo.toml | 2 ++ rust/sedona-expr/Cargo.toml | 1 + rust/sedona-geometry/Cargo.toml | 1 + rust/sedona-raster/Cargo.toml | 2 ++ 8 files changed, 20 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index fcf1304e..dda9d836 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4932,6 +4932,7 @@ dependencies = [ "sedona-common", "sedona-geometry", "sedona-schema", + "sedona-testing", "serde", "serde_json", ] @@ -5032,6 +5033,7 @@ dependencies = [ "datafusion-expr", "errno", "rstest", + "sedona", "sedona-expr", "sedona-functions", "sedona-schema", @@ -5047,6 +5049,7 @@ dependencies = [ "geo-types", "lru", "rstest", + "sedona-testing", "serde", "serde_json", "serde_with", @@ -5106,6 +5109,7 @@ dependencies = [ "geo-types", "geos", "rstest", + "sedona", "sedona-common", "sedona-expr", "sedona-functions", @@ -5147,7 +5151,9 @@ dependencies = [ "arrow-array", "arrow-buffer", "arrow-schema", + "sedona-common", "sedona-schema", + "sedona-testing", ] [[package]] @@ -5182,7 +5188,9 @@ dependencies = [ "paste", "regex", "rstest", + "sedona", "sedona-expr", + "sedona-functions", "sedona-schema", "sedona-testing", "thiserror 2.0.17", @@ -5279,6 +5287,8 @@ dependencies = [ "datafusion-common", "datafusion-expr", "geo", + "rstest", + "sedona", "sedona-expr", "sedona-functions", "sedona-schema", diff --git a/c/sedona-geoarrow-c/Cargo.toml b/c/sedona-geoarrow-c/Cargo.toml index b89ee421..806442b6 100644 --- a/c/sedona-geoarrow-c/Cargo.toml +++ b/c/sedona-geoarrow-c/Cargo.toml @@ -32,6 +32,7 @@ cc = { version = "1" } [dev-dependencies] criterion = { workspace = true } rstest = { workspace = true } +sedona = { workspace = true } sedona-testing = { workspace = true, features = ["criterion"] } [dependencies] diff --git a/c/sedona-geos/Cargo.toml b/c/sedona-geos/Cargo.toml index d627cf3b..47c46674 100644 --- a/c/sedona-geos/Cargo.toml +++ b/c/sedona-geos/Cargo.toml @@ -28,6 +28,7 @@ rust-version.workspace = true [dev-dependencies] criterion = { workspace = true } +sedona = { workspace = true } sedona-testing = { workspace = true, features = ["criterion"] } rstest = { workspace = true } geo-types = { workspace = true } diff --git a/c/sedona-s2geography/Cargo.toml b/c/sedona-s2geography/Cargo.toml index b9ad3c5c..4b768e31 100644 --- a/c/sedona-s2geography/Cargo.toml +++ b/c/sedona-s2geography/Cargo.toml @@ -33,6 +33,7 @@ regex = { workspace = true } [dev-dependencies] criterion = { workspace = true } rstest = { workspace = true } +sedona = { workspace = true } sedona-testing = { workspace = true, features = ["criterion"] } [dependencies] @@ -42,6 +43,7 @@ datafusion-common = { workspace = true } datafusion-expr = { workspace = true } errno = { version = "0.3" } sedona-expr = { workspace = true } +sedona-functions = { workspace = true } sedona-schema = { workspace = true } thiserror = { workspace = true } paste = "1.0.15" diff --git a/c/sedona-tg/Cargo.toml b/c/sedona-tg/Cargo.toml index cd335f7a..cb820912 100644 --- a/c/sedona-tg/Cargo.toml +++ b/c/sedona-tg/Cargo.toml @@ -31,6 +31,8 @@ cc = { version = "1" } [dev-dependencies] criterion = { workspace = true } +rstest = { workspace = true } +sedona = { workspace = true } sedona-testing = { workspace = true, features = ["criterion"] } wkb = { workspace = true } geo = { workspace = true } diff --git a/rust/sedona-expr/Cargo.toml b/rust/sedona-expr/Cargo.toml index 552c367f..5e07fabf 100644 --- a/rust/sedona-expr/Cargo.toml +++ b/rust/sedona-expr/Cargo.toml @@ -29,6 +29,7 @@ result_large_err = "allow" [dev-dependencies] rstest = { workspace = true } +sedona-testing = { workspace = true } [dependencies] arrow-schema = { workspace = true } diff --git a/rust/sedona-geometry/Cargo.toml b/rust/sedona-geometry/Cargo.toml index 8f127589..a0f2ef41 100644 --- a/rust/sedona-geometry/Cargo.toml +++ b/rust/sedona-geometry/Cargo.toml @@ -30,6 +30,7 @@ result_large_err = "allow" [dev-dependencies] geo-types = { workspace = true } rstest = { workspace = true } +sedona-testing = { workspace = true } serde_json = { workspace = true } wkt = { workspace = true } diff --git a/rust/sedona-raster/Cargo.toml b/rust/sedona-raster/Cargo.toml index 5358b9f7..68c66cb9 100644 --- a/rust/sedona-raster/Cargo.toml +++ b/rust/sedona-raster/Cargo.toml @@ -31,6 +31,8 @@ result_large_err = "allow" arrow-schema = { workspace = true } arrow-array = { workspace = true } arrow-buffer = { workspace = true } +sedona-common = { workspace = true } sedona-schema = { workspace = true } [dev-dependencies] +sedona-testing = { workspace = true } From 3f291cb61f87832545420b666927e97885445eb2 Mon Sep 17 00:00:00 2001 From: zhangfengcdt Date: Fri, 21 Nov 2025 09:04:01 -0700 Subject: [PATCH 3/3] fix clippy errors --- Cargo.toml | 2 +- c/sedona-geoarrow-c/Cargo.toml | 2 +- c/sedona-geos/Cargo.toml | 2 +- c/sedona-proj/Cargo.toml | 2 +- c/sedona-s2geography/Cargo.toml | 2 +- c/sedona-tg/Cargo.toml | 2 +- rust/sedona-expr/Cargo.toml | 2 +- rust/sedona-functions/Cargo.toml | 2 +- rust/sedona-geo-generic-alg/Cargo.toml | 2 +- rust/sedona-geo/Cargo.toml | 2 +- rust/sedona-geometry/Cargo.toml | 2 +- rust/sedona-geoparquet/Cargo.toml | 2 +- rust/sedona-raster-functions/Cargo.toml | 2 +- rust/sedona-raster/Cargo.toml | 2 +- rust/sedona-spatial-join/Cargo.toml | 2 +- rust/sedona-testing/Cargo.toml | 1 + rust/sedona/Cargo.toml | 2 +- 17 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2d57b3ac..11378dc9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -140,7 +140,7 @@ sedona-raster = { version = "0.2.0", path = "rust/sedona-raster" } sedona-raster-functions = { version = "0.2.0", path = "rust/sedona-raster-functions" } sedona-schema = { version = "0.2.0", path = "rust/sedona-schema" } sedona-spatial-join = { version = "0.2.0", path = "rust/sedona-spatial-join" } -sedona-testing = { version = "0.2.0", path = "rust/sedona-testing" } +# sedona-testing is not published to crates.io, so it uses path-only in individual crates # C wrapper crates sedona-geoarrow-c = { version = "0.2.0", path = "c/sedona-geoarrow-c" } diff --git a/c/sedona-geoarrow-c/Cargo.toml b/c/sedona-geoarrow-c/Cargo.toml index 806442b6..b9348387 100644 --- a/c/sedona-geoarrow-c/Cargo.toml +++ b/c/sedona-geoarrow-c/Cargo.toml @@ -33,7 +33,7 @@ cc = { version = "1" } criterion = { workspace = true } rstest = { workspace = true } sedona = { workspace = true } -sedona-testing = { workspace = true, features = ["criterion"] } +sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } [dependencies] arrow-schema = { workspace = true } diff --git a/c/sedona-geos/Cargo.toml b/c/sedona-geos/Cargo.toml index 47c46674..260f3de1 100644 --- a/c/sedona-geos/Cargo.toml +++ b/c/sedona-geos/Cargo.toml @@ -29,7 +29,7 @@ rust-version.workspace = true [dev-dependencies] criterion = { workspace = true } sedona = { workspace = true } -sedona-testing = { workspace = true, features = ["criterion"] } +sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } rstest = { workspace = true } geo-types = { workspace = true } diff --git a/c/sedona-proj/Cargo.toml b/c/sedona-proj/Cargo.toml index bcd0339c..556e9575 100644 --- a/c/sedona-proj/Cargo.toml +++ b/c/sedona-proj/Cargo.toml @@ -34,7 +34,7 @@ approx = { workspace = true } geo-types = { workspace = true } rstest = { workspace = true } wkb = { workspace = true } -sedona-testing = { workspace = true, features = ["criterion"] } +sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } criterion = { workspace = true} [features] diff --git a/c/sedona-s2geography/Cargo.toml b/c/sedona-s2geography/Cargo.toml index 4b768e31..603ac080 100644 --- a/c/sedona-s2geography/Cargo.toml +++ b/c/sedona-s2geography/Cargo.toml @@ -34,7 +34,7 @@ regex = { workspace = true } criterion = { workspace = true } rstest = { workspace = true } sedona = { workspace = true } -sedona-testing = { workspace = true, features = ["criterion"] } +sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } [dependencies] arrow-schema = { workspace = true } diff --git a/c/sedona-tg/Cargo.toml b/c/sedona-tg/Cargo.toml index cb820912..fe5a1d98 100644 --- a/c/sedona-tg/Cargo.toml +++ b/c/sedona-tg/Cargo.toml @@ -33,7 +33,7 @@ cc = { version = "1" } criterion = { workspace = true } rstest = { workspace = true } sedona = { workspace = true } -sedona-testing = { workspace = true, features = ["criterion"] } +sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] } wkb = { workspace = true } geo = { workspace = true } diff --git a/rust/sedona-expr/Cargo.toml b/rust/sedona-expr/Cargo.toml index 5e07fabf..b911b509 100644 --- a/rust/sedona-expr/Cargo.toml +++ b/rust/sedona-expr/Cargo.toml @@ -29,7 +29,7 @@ result_large_err = "allow" [dev-dependencies] rstest = { workspace = true } -sedona-testing = { workspace = true } +sedona-testing = { path = "../sedona-testing" } [dependencies] arrow-schema = { workspace = true } diff --git a/rust/sedona-functions/Cargo.toml b/rust/sedona-functions/Cargo.toml index 8ab2b4cb..5a39a2d3 100644 --- a/rust/sedona-functions/Cargo.toml +++ b/rust/sedona-functions/Cargo.toml @@ -31,7 +31,7 @@ result_large_err = "allow" arrow-json = { workspace = true } criterion = { workspace = true } rstest = { workspace = true } -sedona-testing = { workspace = true, features = ["criterion"] } +sedona-testing = { path = "../sedona-testing", features = ["criterion"] } datafusion = { workspace = true } tokio = { workspace = true, features = ["rt", "macros"] } diff --git a/rust/sedona-geo-generic-alg/Cargo.toml b/rust/sedona-geo-generic-alg/Cargo.toml index 0fc101ee..6f5a91d7 100644 --- a/rust/sedona-geo-generic-alg/Cargo.toml +++ b/rust/sedona-geo-generic-alg/Cargo.toml @@ -36,7 +36,7 @@ rstar = "0.12.0" i_overlay = { version = "4.0.0, < 4.1.0", default-features = false } [dev-dependencies] -sedona-testing = { workspace = true } +sedona-testing = { path = "../sedona-testing" } approx = { workspace = true } criterion = { workspace = true } pretty_env_logger = "0.4" diff --git a/rust/sedona-geo/Cargo.toml b/rust/sedona-geo/Cargo.toml index a3c94c7c..7fa02d73 100644 --- a/rust/sedona-geo/Cargo.toml +++ b/rust/sedona-geo/Cargo.toml @@ -32,7 +32,7 @@ criterion = { workspace = true } rstest = { workspace = true } sedona-geometry = { workspace = true } sedona-schema = { workspace = true } -sedona-testing = { workspace = true, features = ["criterion", "geo"] } +sedona-testing = { path = "../sedona-testing", features = ["criterion", "geo"] } wkt = { workspace = true } [dependencies] diff --git a/rust/sedona-geometry/Cargo.toml b/rust/sedona-geometry/Cargo.toml index a0f2ef41..7d3a45c1 100644 --- a/rust/sedona-geometry/Cargo.toml +++ b/rust/sedona-geometry/Cargo.toml @@ -30,7 +30,7 @@ result_large_err = "allow" [dev-dependencies] geo-types = { workspace = true } rstest = { workspace = true } -sedona-testing = { workspace = true } +sedona-testing = { path = "../sedona-testing" } serde_json = { workspace = true } wkt = { workspace = true } diff --git a/rust/sedona-geoparquet/Cargo.toml b/rust/sedona-geoparquet/Cargo.toml index cdf07935..b14beef5 100644 --- a/rust/sedona-geoparquet/Cargo.toml +++ b/rust/sedona-geoparquet/Cargo.toml @@ -31,7 +31,7 @@ result_large_err = "allow" default = [] [dev-dependencies] -sedona-testing = { workspace = true } +sedona-testing = { path = "../sedona-testing" } url = { workspace = true } rstest = { workspace = true } tempfile = { workspace = true } diff --git a/rust/sedona-raster-functions/Cargo.toml b/rust/sedona-raster-functions/Cargo.toml index b7ab2298..6c681f8a 100644 --- a/rust/sedona-raster-functions/Cargo.toml +++ b/rust/sedona-raster-functions/Cargo.toml @@ -40,7 +40,7 @@ sedona-schema = { workspace = true } [dev-dependencies] criterion = { workspace = true } -sedona-testing = { workspace = true, features = ["criterion"] } +sedona-testing = { path = "../sedona-testing", features = ["criterion"] } rstest = { workspace = true } [[bench]] diff --git a/rust/sedona-raster/Cargo.toml b/rust/sedona-raster/Cargo.toml index 68c66cb9..6a8d8896 100644 --- a/rust/sedona-raster/Cargo.toml +++ b/rust/sedona-raster/Cargo.toml @@ -35,4 +35,4 @@ sedona-common = { workspace = true } sedona-schema = { workspace = true } [dev-dependencies] -sedona-testing = { workspace = true } +sedona-testing = { path = "../sedona-testing" } diff --git a/rust/sedona-spatial-join/Cargo.toml b/rust/sedona-spatial-join/Cargo.toml index f06de282..046a8be6 100644 --- a/rust/sedona-spatial-join/Cargo.toml +++ b/rust/sedona-spatial-join/Cargo.toml @@ -65,7 +65,7 @@ float_next_after = { workspace = true } [dev-dependencies] criterion = { workspace = true } rstest = { workspace = true } -sedona-testing = { workspace = true } +sedona-testing = { path = "../sedona-testing" } wkt = { workspace = true } tokio = { workspace = true, features = ["macros"] } rand = { workspace = true } diff --git a/rust/sedona-testing/Cargo.toml b/rust/sedona-testing/Cargo.toml index e3c1696a..f0a96b94 100644 --- a/rust/sedona-testing/Cargo.toml +++ b/rust/sedona-testing/Cargo.toml @@ -23,6 +23,7 @@ description.workspace = true readme.workspace = true edition.workspace = true rust-version.workspace = true +publish = false # This crate is for testing only and not published to crates.io [lints.clippy] result_large_err = "allow" diff --git a/rust/sedona/Cargo.toml b/rust/sedona/Cargo.toml index d210a9e4..ece17adf 100644 --- a/rust/sedona/Cargo.toml +++ b/rust/sedona/Cargo.toml @@ -74,7 +74,7 @@ sedona-raster-functions = { workspace = true } sedona-schema = { workspace = true } sedona-spatial-join = { workspace = true, optional = true } sedona-s2geography = { workspace = true, optional = true } -sedona-testing = { workspace = true } +sedona-testing = { path = "../sedona-testing" } sedona-tg = { workspace = true, optional = true } serde = { workspace = true } serde_json = { workspace = true }