Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Cargo.lock

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

29 changes: 25 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 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" }
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" }
8 changes: 4 additions & 4 deletions c/sedona-geoarrow-c/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cc = { version = "1" }
[dev-dependencies]
criterion = { workspace = true }
rstest = { workspace = true }
sedona = { path = "../../rust/sedona" }
sedona = { workspace = true }
sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] }

[dependencies]
Expand All @@ -41,9 +41,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]]
Expand Down
12 changes: 6 additions & 6 deletions c/sedona-geos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ rust-version.workspace = true

[dev-dependencies]
criterion = { workspace = true }
sedona = { path = "../../rust/sedona" }
sedona = { workspace = true }
sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] }
rstest = { workspace = true }
geo-types = { workspace = true }
Expand All @@ -39,11 +39,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 }
Expand Down
8 changes: 4 additions & 4 deletions c/sedona-proj/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
8 changes: 4 additions & 4 deletions c/sedona-s2geography/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ regex = { workspace = true }
[dev-dependencies]
criterion = { workspace = true }
rstest = { workspace = true }
sedona = { path = "../../rust/sedona" }
sedona = { workspace = true }
sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] }

[dependencies]
Expand All @@ -42,9 +42,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 }
paste = "1.0.15"

Expand Down
8 changes: 4 additions & 4 deletions c/sedona-tg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cc = { version = "1" }
[dev-dependencies]
criterion = { workspace = true }
rstest = { workspace = true }
sedona = { path = "../../rust/sedona" }
sedona = { workspace = true }
sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] }
wkb = { workspace = true }
geo = { workspace = true }
Expand All @@ -42,9 +42,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]]
Expand Down
14 changes: 7 additions & 7 deletions python/sedonadb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
12 changes: 6 additions & 6 deletions r/sedonadb/src/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
2 changes: 1 addition & 1 deletion rust/sedona-adbc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions rust/sedona-datasource/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
9 changes: 4 additions & 5 deletions rust/sedona-expr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@ rust-version.workspace = true
result_large_err = "allow"

[dev-dependencies]
sedona-testing = { path = "../sedona-testing" }
rstest = { workspace = true }
sedona-testing = { path = "../sedona-testing" }

[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 }
8 changes: 4 additions & 4 deletions rust/sedona-functions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion rust/sedona-geo-generic-alg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions rust/sedona-geo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ result_large_err = "allow"
[dev-dependencies]
criterion = { workspace = true }
rstest = { workspace = true }
sedona-geometry = { path = "../sedona-geometry" }
sedona-schema = { path = "../sedona-schema" }
sedona-geometry = { workspace = true }
sedona-schema = { workspace = true }
sedona-testing = { path = "../sedona-testing", features = ["criterion", "geo"] }
wkt = { workspace = true }

Expand All @@ -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]]
Expand Down
10 changes: 5 additions & 5 deletions rust/sedona-geoparquet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
8 changes: 4 additions & 4 deletions rust/sedona-raster-functions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ 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 }
Expand Down
4 changes: 2 additions & 2 deletions rust/sedona-raster/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ 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-common = { workspace = true }
sedona-schema = { workspace = true }

[dev-dependencies]
sedona-testing = { path = "../sedona-testing" }
2 changes: 1 addition & 1 deletion rust/sedona-schema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
20 changes: 10 additions & 10 deletions rust/sedona-spatial-join/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Loading
Loading