From a9515c2667c72bf84b8b258b23337d2bb72fe9a5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Apr 2022 08:33:05 -0700 Subject: [PATCH 1/3] FIX: update to proper minimum geo-types version geo-types before 0.7.4 won't compile --- geo/CHANGES.md | 4 ++++ geo/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/geo/CHANGES.md b/geo/CHANGES.md index 97d01d1fed..687c9e26d0 100644 --- a/geo/CHANGES.md +++ b/geo/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## UNRELEASED + +* FIX: update to proper minimum geo-types version + ## 0.20.0 * Add `LinesIter` algorithm to iterate over the lines in geometries. diff --git a/geo/Cargo.toml b/geo/Cargo.toml index 044fe3d26c..c7ad8b8925 100644 --- a/geo/Cargo.toml +++ b/geo/Cargo.toml @@ -16,7 +16,7 @@ proj-network = ["use-proj", "proj/network"] use-serde = ["serde", "geo-types/serde"] [dependencies] -geo-types = { version = "0.7.3", features = ["approx", "use-rstar"] } +geo-types = { version = "0.7.4", features = ["approx", "use-rstar"] } geographiclib-rs = "0.2" log = "0.4.11" num-traits = "0.2" From d733c65675968c12ee1b48caf2f8aabb84997d57 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Apr 2022 08:36:36 -0700 Subject: [PATCH 2/3] prepare for 0.20.1 release --- geo/CHANGES.md | 2 +- geo/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/geo/CHANGES.md b/geo/CHANGES.md index 687c9e26d0..c85917dfaf 100644 --- a/geo/CHANGES.md +++ b/geo/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## UNRELEASED +## 0.20.1 * FIX: update to proper minimum geo-types version diff --git a/geo/Cargo.toml b/geo/Cargo.toml index c7ad8b8925..2846772e5d 100644 --- a/geo/Cargo.toml +++ b/geo/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "geo" description = "Geospatial primitives and algorithms" -version = "0.20.0" +version = "0.20.1" license = "MIT/Apache-2.0" repository = "https://github.com/georust/geo" documentation = "https://docs.rs/geo/" From cabe50d0e498abfa7fddc2d036ba6fef567e2b28 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Apr 2022 08:53:27 -0700 Subject: [PATCH 3/3] work around: GH actions don't run on PR conflict Apparently GH actions don't run on PR conflicts: https://github.community/t/run-actions-on-pull-requests-with-merge-conflicts/17104 I know that this PR conflicts with the master branch - I'll resolve the conflicts before reverse integrating the branch, but I need to see the tests pass against the code I'm about to release! --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d298bd9ef0..b1fad94dd9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,6 +4,7 @@ on: - main - staging - trying + - release/** pull_request: schedule: [cron: "45 6 * * *"]