Make geozero required dep

geoarrow · Oct 9, 2024 · 03ed81b · 03ed81b
1 parent deecb14
commit 03ed81b
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 36 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,8 +10,8 @@ categories = ["science::geo"]
 rust-version = "1.80"
 
 [features]
-csv = ["dep:geozero", "geozero/with-csv"]
-flatgeobuf = ["dep:flatgeobuf", "geozero"]
+csv = ["geozero/with-csv"]
+flatgeobuf = ["dep:flatgeobuf"]
 flatgeobuf_async = [
  "flatgeobuf/http",
  "dep:async-trait",
@@ -21,14 +21,6 @@ flatgeobuf_async = [
 ]
 gdal = ["dep:gdal"]
 geos = ["dep:geos"]
-geozero = [
- "dep:arrow-cast",
- "dep:chrono",
- "dep:geozero",
- "dep:half",
- "dep:indexmap",
- "dep:lexical-core",
-]
 ipc_compression = ["arrow-ipc/lz4", "arrow-ipc/zstd"]
 parquet = ["dep:parquet"]
 parquet_async = [
@@ -46,7 +38,7 @@ parquet_compression = [
  "parquet/zstd",
 ]
 polylabel = ["dep:polylabel"]
-postgis = ["dep:chrono", "dep:futures", "dep:sqlx", "geozero"]
+postgis = ["dep:futures", "dep:sqlx"]
 proj = ["dep:proj"]
 rayon = ["dep:rayon"]
 
@@ -55,15 +47,15 @@ rayon = ["dep:rayon"]
 arrow = { version = "53", features = ["ffi"] }
 arrow-array = { version = "53", features = ["chrono-tz"] }
 arrow-buffer = "53"
-arrow-cast = { version = "53", optional = true }
+arrow-cast = { version = "53" }
 arrow-data = "53"
 arrow-ipc = "53"
 arrow-schema = "53"
 async-stream = { version = "0.3", optional = true }
 async-trait = { version = "0.1", optional = true }
 byteorder = "1"
 bytes = { version = "1.5.0", optional = true }
-chrono = { version = "0.4", optional = true }
+chrono = { version = "0.4" }
 dbase = "0.5.0"
 enum-as-inner = "0.6.1"
 # Set default-features = false because async not working in wasm right now
@@ -73,11 +65,11 @@ gdal = { version = "0.17", optional = true }
 geo = "0.28"
 geo-index = "0.1.1"
 geos = { version = "9.0", features = ["v3_10_0", "geo"], optional = true }
-geozero = { version = "0.14", features = ["with-wkb"], optional = true }
-half = { version = "2.4.1", optional = true }
+geozero = { version = "0.14", features = ["with-wkb"] }
+half = { version = "2.4.1" }
 http-range-client = { version = "0.8", optional = true }
-indexmap = { version = "2", optional = true }
-lexical-core = { version = "0.8.5", optional = true }
+indexmap = { version = "2" }
+lexical-core = { version = "0.8.5" }
 num_enum = "0.7"
 object_store = { version = "0.11", optional = true }
 parquet = { version = "53", optional = true, default-features = false, features = [
@@ -160,12 +152,4 @@ required-features = ["parquet_compression"]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
-features = [
- "csv",
- "flatgeobuf",
- "geos",
- "geozero",
- "parquet",
- "postgis",
- "rayon",
-]
+features = ["csv", "flatgeobuf", "geos", "parquet", "postgis", "rayon"]
diff --git a/js/Cargo.lock b/js/Cargo.lock
diff --git a/js/Cargo.toml b/js/Cargo.toml
@@ -27,7 +27,7 @@ data = []
 geodesy = ["dep:geodesy"]
 debug = ["console_error_panic_hook"]
 io_flatgeobuf = ["geoarrow/flatgeobuf", "table"]
-io_geojson = ["geoarrow/geozero", "table"]
+io_geojson = ["table"]
 io_http = []
 io_object_store = [
  "dep:async-trait",

diff --git a/python/Cargo.lock b/python/Cargo.lock
diff --git a/python/Cargo.toml b/python/Cargo.toml
@@ -18,9 +18,9 @@ arrow = "53"
 arrow-array = "53"
 arrow-buffer = "53"
 arrow-schema = "53"
-geoarrow = { path = "../", features = ["geozero"] }
+geoarrow = { path = "../" }
 # Uncomment when publishing
-# geoarrow = { version = "0.4.0-beta.1", features = ["geozero"] }
+# geoarrow = { version = "0.4.0-beta.1" }
 geozero = "0.14"
 indexmap = "2.5.0"
 object_store = "0.11"

diff --git a/python/geoarrow-compute/Cargo.toml b/python/geoarrow-compute/Cargo.toml
@@ -30,7 +30,7 @@ pyo3 = { workspace = true }
 pyo3-arrow = { workspace = true }
 pyo3-geoarrow = { path = "../pyo3-geoarrow" }
 geo = "0.28"
-geoarrow = { workspace = true, features = ["geozero"] }
+geoarrow = { workspace = true }
 geozero = { version = "0.14", features = ["with-svg"] }
 numpy = "0.21"
 serde_json = "1"

diff --git a/python/geoarrow-core/Cargo.toml b/python/geoarrow-core/Cargo.toml
@@ -30,7 +30,7 @@ pyo3 = { workspace = true }
 pyo3-arrow = { workspace = true }
 pyo3-geoarrow = { path = "../pyo3-geoarrow" }
 geo = "0.28"
-geoarrow = { workspace = true, features = ["geozero"] }
+geoarrow = { workspace = true }
 geozero = { version = "0.14", features = ["with-svg"] }
 numpy = "0.21"
 serde_json = "1"

diff --git a/python/geoarrow-io/Cargo.toml b/python/geoarrow-io/Cargo.toml
@@ -53,7 +53,6 @@ geo = "0.28"
 geoarrow = { path = "../../", features = [
  "csv",
  "flatgeobuf",
- "geozero",
  "ipc_compression",
  "parquet_compression",
  "parquet",

diff --git a/python/pyo3-geoarrow/Cargo.toml b/python/pyo3-geoarrow/Cargo.toml
@@ -17,7 +17,7 @@ arrow-array = { workspace = true }
 arrow-buffer = { workspace = true }
 arrow-schema = { workspace = true }
 geo = "0.28"
-geoarrow = { workspace = true, features = ["geozero"] }
+geoarrow = { workspace = true }
 geozero = { workspace = true }
 indexmap = { workspace = true }
 pyo3 = { workspace = true, features = ["chrono", "indexmap"] }