Skip to content

Commit

Permalink
Merge 1589df5 into 75a6e54
Browse files Browse the repository at this point in the history
  • Loading branch information
urschrei committed Mar 19, 2020
2 parents 75a6e54 + 1589df5 commit 1b1dbc4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ before_cache:
before_install:
- if [ "${GEO_FEATURES}" == "--features use-proj" ]; then
sudo apt-get update;
wget https://github.com/OSGeo/proj.4/releases/download/6.2.1/proj-6.2.1.tar.gz;
tar -xzvf proj-6.2.1.tar.gz;
pushd proj-6.2.1 && ./configure --prefix=/usr && make && sudo make install && popd;
wget https://github.com/OSGeo/PROJ/releases/download/7.0.0/proj-7.0.0.tar.gz;
tar -xzvf proj-7.0.0.tar.gz;
pushd proj-7.0.0 && ./configure --prefix=/usr && make && sudo make install && popd;
fi

script:
Expand Down
6 changes: 3 additions & 3 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes

## geo (unreleased)

## geo 0.12.3
* Bump proj to 0.15.1
* Add a mutable Coordinate iterator to LineString
* https://github.com/georust/geo/pull/404
* Fix for rectangle intersection check
Expand All @@ -21,7 +21,7 @@
* Remove usages of 'failure' crate
* <https://github.com/georust/geo/pull/388>

## geo-types (unreleased)
## geo-types 0.4.4

* Update Geometry enum with iterators and TryFrom impls for primitives
* https://github.com/georust/geo/pull/410
Expand Down
2 changes: 1 addition & 1 deletion geo-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "geo-types"
version = "0.4.3"
version = "0.4.4"
authors = ["Corey Farwell <coreyf@rwell.org>"]
license = "MIT/Apache-2.0"
repository = "https://github.com/georust/geo"
Expand Down
4 changes: 2 additions & 2 deletions geo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "geo"
description = "Geospatial primitives and algorithms"
version = "0.12.2"
version = "0.12.3"
authors = ["Corey Farwell <coreyf@rwell.org>"]
license = "MIT/Apache-2.0"
repository = "https://github.com/georust/geo"
Expand All @@ -19,7 +19,7 @@ num-traits = "0.2"
serde = { version = "1.0", optional = true, features = ["derive"] }
rstar = { version = "0.7" }
postgis = { version = "0.6", optional = true }
proj = { version = "0.14.4", optional = true }
proj = { version = "0.15.1", optional = true }

# Swap the next two lines when publishing
# geo-types = { version = "0.4.2", features = ["rstar"] }
Expand Down

0 comments on commit 1b1dbc4

Please sign in to comment.