Skip to content

Commit

Permalink
Merge #850 #857
Browse files Browse the repository at this point in the history
850: #849 Bump the minor version of approx. r=michaelkirk a=martinfrances107

- [x ] I agree to follow the project's [code of conduct](https://github.com/georust/geo/blob/main/CODE_OF_CONDUCT.md).
---

Consitently and in many Cargo.toml files  - bump the minor version of approx.


-approx = "0.4.0"
+approx = "0.5.1"

857: geo/geo bump  proj to 0.27.0 r=michaelkirk a=martinfrances107

The is a ongoing discussion in #856 about how to signal to the wider community that our dependencies are changing.

But this is issue follows the pattern developed in #850 



Co-authored-by: Martin <martinfrances107@hotmail.com>
Co-authored-by: Michael Kirk <michael.code@endoftheworl.de>
  • Loading branch information
3 people committed Jun 24, 2022
3 parents b1fcf2e + 45bddc0 + 0d11771 commit 6b01547
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion geo-bool-ops-benches/Cargo.toml
Expand Up @@ -11,7 +11,7 @@ geo-types = { path = "../geo-types" }
log = "0.4.11"

[dev-dependencies]
approx = "0.4.0"
approx = ">= 0.4.0, < 0.6.0"
criterion = { version = "0.3", features = ["html_reports"] }
geo-test-fixtures = { path = "../geo-test-fixtures" }
jts-test-runner = { path = "../jts-test-runner" }
Expand Down
4 changes: 2 additions & 2 deletions geo-types/Cargo.toml
Expand Up @@ -19,12 +19,12 @@ use-rstar_0_8 = ["rstar_0_8", "approx"]
use-rstar_0_9 = ["rstar_0_9", "approx"]

[dependencies]
approx = { version = "0.4.0", optional = true }
approx = { version = ">= 0.4.0, < 0.6.0", optional = true }
arbitrary = { version = "1", optional = true }
num-traits = "0.2"
rstar_0_8 = { package = "rstar", version = "0.8", optional = true }
rstar_0_9 = { package = "rstar", version = "0.9", optional = true }
serde = { version = "1", optional = true, features = ["derive"] }

[dev-dependencies]
approx = "0.4.0"
approx = ">= 0.4.0, < 0.6.0"
4 changes: 2 additions & 2 deletions geo/Cargo.toml
Expand Up @@ -21,13 +21,13 @@ geo-types = { version = "0.7.5", features = ["approx", "use-rstar_0_9"] }
geographiclib-rs = "0.2"
log = "0.4.11"
num-traits = "0.2"
proj = { version = "0.26.0", optional = true }
proj = { version = "0.27.0", optional = true }
robust = "0.2.2"
rstar = "0.9.3"
serde = { version = "1.0", optional = true, features = ["derive"] }

[dev-dependencies]
approx = "0.4.0"
approx = ">= 0.4.0, < 0.6.0"
criterion = { version = "0.3", features = ["html_reports"] }
geo-test-fixtures = { path = "../geo-test-fixtures" }
jts-test-runner = { path = "../jts-test-runner" }
Expand Down
2 changes: 1 addition & 1 deletion geo/src/algorithm/transform.rs
@@ -1,4 +1,4 @@
pub use proj::{Area, Coord, Info, Proj, ProjBuilder, ProjError, Projinfo, Transform};
pub use proj::{Area, Coord, Info, Proj, ProjBuilder, ProjError, ProjInfo, Transform};

#[cfg(test)]
mod tests {
Expand Down
2 changes: 1 addition & 1 deletion jts-test-runner/Cargo.toml
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
approx = "0.4.0"
approx = ">= 0.4.0, < 0.6.0"
geo = { path = "../geo" }
include_dir = { version = "0.7.2", features = ["glob"] }
log = "0.4.14"
Expand Down

0 comments on commit 6b01547

Please sign in to comment.