Skip to content

Commit

Permalink
Merge #850 #857 #859 #860
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 



859: bump geojson to 0.23.0 r=michaelkirk a=martinfrances107

geojson is a internal dev-dependency.

860: Hide test artifact. 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).
---

Alter .gitignore to remove a test artefact.


Co-authored-by: Martin <martinfrances107@hotmail.com>
  • Loading branch information
bors[bot] and martinfrances107 committed Jun 24, 2022
5 parents bc68587 + 45bddc0 + d474c38 + 4eb96c0 + 232b3a4 commit f4dc543
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions geo-bool-ops-benches/.gitignore
@@ -0,0 +1 @@
rust-geo-booleanop-fixtures.json
6 changes: 3 additions & 3 deletions 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 All @@ -28,8 +28,8 @@ glob = "0.3.0"
gt_prev = { version = "0.6.2" , package = "geo-types" }
geo-booleanop = "0.3.2"
wkt = "0.10.1"
geojson = { version = "0.22.3", features = [ "geo-types" ] }
geojson = { version = "0.23.0", features = [ "geo-types" ] }

[[bench]]
name = "boolean_ops"
harness = false
harness = false
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 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 f4dc543

Please sign in to comment.