From 9d80a2bf9fd5c4f311e64ffd40087dfb41fa55a5 Mon Sep 17 00:00:00 2001 From: Nico Mandery Date: Sat, 16 Dec 2023 20:23:29 +0100 Subject: [PATCH] upgrade dependencies. #76 --- Cargo.toml | 1 + h3ron-graph/CHANGES.md | 3 +++ h3ron-graph/Cargo.toml | 8 ++++---- h3ron-h3-sys/CHANGES.md | 5 ++++- h3ron-h3-sys/Cargo.toml | 4 ++-- h3ron-h3-sys/src/prebuild_bindings.rs | 2 +- h3ron-ndarray/CHANGES.md | 4 ++++ h3ron-ndarray/Cargo.toml | 6 +++--- h3ron-polars/CHANGES.md | 3 +++ h3ron-polars/Cargo.toml | 6 +++--- h3ron/CHANGES.md | 3 ++- h3ron/Cargo.toml | 6 +++--- 12 files changed, 33 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 29b23bd..f068abb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "h3ron", diff --git a/h3ron-graph/CHANGES.md b/h3ron-graph/CHANGES.md index cbb6473..e236c7b 100644 --- a/h3ron-graph/CHANGES.md +++ b/h3ron-graph/CHANGES.md @@ -10,10 +10,13 @@ without github actions and without having to coordinate the release process with python extension. ## h3ron-graph Unreleased + +## h3ron-graph 0.7.0 - 2023-12-16 ### Changed * Upgrade `lz4_flex` to 0.11, `osmpbfreader` to 0.16 * Upgraded `geo` to 0.26 * Upgrade `indexmap` to 2 +* Upgrade `h3ron` to 0.18 ## h3ron-graph 0.6.0 - 2023-01-19 ### Changed diff --git a/h3ron-graph/Cargo.toml b/h3ron-graph/Cargo.toml index 5431aba..ae5a2fa 100644 --- a/h3ron-graph/Cargo.toml +++ b/h3ron-graph/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "h3ron-graph" -version = "0.6.0" +version = "0.7.0" authors = ["Nico Mandery "] description = "Graph algorithms on edges of th3 H3 spatial indexing system" edition = "2021" @@ -22,7 +22,7 @@ io_osm = ["osmpbfreader"] io_serde_util = ["bincode", "lz4_flex", "h3ron/use-serde"] [dependencies] -geo = "0.26" +geo = "0.27" geo-types = "0.7" rayon = "^1.5" log = "^0.4" @@ -32,7 +32,7 @@ num-traits = "0.2" [dependencies.h3ron] path = "../h3ron" -version = "0.17" # for publishing on crates.io +version = "0.18" # for publishing on crates.io features = ["use-rayon", "roaring", "use-serde"] [dependencies.smallvec] @@ -48,7 +48,7 @@ version = "1" features = ["derive"] [dependencies.ordered-float] -version = "3" +version = "4" features = ["serde"] optional = true diff --git a/h3ron-h3-sys/CHANGES.md b/h3ron-h3-sys/CHANGES.md index 40c9896..79dfe41 100644 --- a/h3ron-h3-sys/CHANGES.md +++ b/h3ron-h3-sys/CHANGES.md @@ -11,7 +11,10 @@ python extension. ## h3ron-h3-sys Unreleased -* Upgrade `bindgen` from 0.63 to 0.66 and rebuild the prebuild bindings. + +## h3ron-h3-sys 0.17.0 - 2023-12-16 +### Changed +* Upgrade `bindgen` from 0.63 to 0.69 and rebuild the prebuild bindings. ## h3ron-h3-sys 0.16.0 - 2023-01-19 ### Changed diff --git a/h3ron-h3-sys/Cargo.toml b/h3ron-h3-sys/Cargo.toml index 832d987..ce4a709 100644 --- a/h3ron-h3-sys/Cargo.toml +++ b/h3ron-h3-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "h3ron-h3-sys" -version = "0.16.0" +version = "0.17.0" description = "bindgen-generated lowlevel bindings for statically linked libh3" authors = ["Nico Mandery "] build = "build.rs" @@ -37,7 +37,7 @@ version = "0.7" optional = true [build-dependencies] -bindgen = { version = "^0.66", optional = true } +bindgen = { version = "^0.69", optional = true } regex = "^1.5.5" cc = "1" glob = "0.3" diff --git a/h3ron-h3-sys/src/prebuild_bindings.rs b/h3ron-h3-sys/src/prebuild_bindings.rs index d521f07..e3a7ad5 100644 --- a/h3ron-h3-sys/src/prebuild_bindings.rs +++ b/h3ron-h3-sys/src/prebuild_bindings.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.66.1 */ +/* automatically generated by rust-bindgen 0.69.1 */ #[doc = " @brief Identifier for an object (cell, edge, etc) in the H3 system.\n\n The H3Index fits within a 64-bit unsigned integer."] pub type H3Index = u64; diff --git a/h3ron-ndarray/CHANGES.md b/h3ron-ndarray/CHANGES.md index 7a699b4..e35e970 100644 --- a/h3ron-ndarray/CHANGES.md +++ b/h3ron-ndarray/CHANGES.md @@ -11,6 +11,10 @@ python extension. ## h3ron-ndarray Unreleased +## h3ron-ndarray 0.18.0 - 2023-12-16 +### Changed +* Upgrade `h3ron` to 0.18 + ## h3ron-ndarray 0.17.0 - 2023-01-19 ### Changed * Upgrade `gdal` from 0.13 to 0.14. diff --git a/h3ron-ndarray/Cargo.toml b/h3ron-ndarray/Cargo.toml index b0ed69b..d795ef9 100644 --- a/h3ron-ndarray/Cargo.toml +++ b/h3ron-ndarray/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "h3ron-ndarray" -version = "0.17.0" +version = "0.18.0" authors = ["Nico Mandery "] description = "Integration with the ndarray crate to generate H3 cells from raster data (using gdal, ...)" edition = "2021" @@ -22,14 +22,14 @@ features = ["rayon"] [dependencies.h3ron] path = "../h3ron" -version = "0.17" # for publishing on crates.io +version = "0.18" # for publishing on crates.io features = ["use-rayon"] [dev-dependencies] approx = "^0.5" env_logger = "^0.10" -ordered-float = "3" +ordered-float = "4" [dev-dependencies.criterion] version = "^0.5" diff --git a/h3ron-polars/CHANGES.md b/h3ron-polars/CHANGES.md index 31fd204..8850341 100644 --- a/h3ron-polars/CHANGES.md +++ b/h3ron-polars/CHANGES.md @@ -1,9 +1,12 @@ # Changelog ## h3ron-polars Unreleased + +## h3ron-polars 0.4.0 - 2023-12-16 * Upgraded `polars` to v0.32, `static_aabb2d_index` to v1 * Upgraded `geo` to 0.26 * Upgraded `rstar` to 0.11 +* Upgrade `h3ron` to 0.18 ## h3ron-polars 0.3.0 - 2023-01-19 * Upgrade polars to v0.26 diff --git a/h3ron-polars/Cargo.toml b/h3ron-polars/Cargo.toml index 3e78db2..140538c 100644 --- a/h3ron-polars/Cargo.toml +++ b/h3ron-polars/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "h3ron-polars" -version = "0.3.0" +version = "0.4.0" authors = ["Nico Mandery "] description = "Integration of the h3 geospatial indexing system with polars dataframes" edition = "2021" @@ -23,7 +23,7 @@ si_full = ["si_kdtree", "si_rtree", "si_packed_hilbert_rtree"] serde = ["dep:serde", "polars-core/serde"] [dependencies] -geo = "0.26" +geo = "0.27" geo-types = "0.7" kdbush = { version = "0.2", optional = true } polars-core = "0.32" @@ -35,7 +35,7 @@ thiserror = "1" [dependencies.h3ron] path = "../h3ron" -version = "0.17" +version = "0.18" features = ["indexmap"] [dev-dependencies] diff --git a/h3ron/CHANGES.md b/h3ron/CHANGES.md index 9a6218a..ed40497 100644 --- a/h3ron/CHANGES.md +++ b/h3ron/CHANGES.md @@ -10,8 +10,9 @@ done without github actions and without having to coordinate the release process python extension. ## h3ron Unreleased -* Upgraded `geo` to 0.26 +* Upgraded `geo` to 0.27 * Upgraded `indexmap` to 2 and `hashbrown` to 0.14 +* Upgrade h3ron-h3-sys to 0.17 ## h3ron 0.17.0 - 2023-01-19 ### Added diff --git a/h3ron/Cargo.toml b/h3ron/Cargo.toml index 52e6c93..a82ecde 100644 --- a/h3ron/Cargo.toml +++ b/h3ron/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "h3ron" description = "High-level rust API for H3" -version = "0.17.0" +version = "0.18.0" authors = ["Nico Mandery "] edition = "2021" license = "MIT" @@ -21,7 +21,7 @@ parse = ["dep:nom"] indexmap = ["dep:indexmap"] [dependencies] -geo = "^0.26" +geo = "^0.27" thiserror = "1.0" ahash = "0.8" indexmap = { version = "2", optional = true } @@ -29,7 +29,7 @@ indexmap = { version = "2", optional = true } [dependencies.h3ron-h3-sys] path = "../h3ron-h3-sys" features = ["geo-types"] -version = "0.16" # for publishing on crates.io +version = "0.17" # for publishing on crates.io [dependencies.geo-types] version = "^0.7"