From a6d98a41ebf9cb3b0c91dedfa6e248e72b27aed3 Mon Sep 17 00:00:00 2001 From: Zacharias Knudsen Date: Wed, 26 Jul 2023 09:22:12 +0200 Subject: [PATCH] Prepare for release v4.1.3 (#139) --- CHANGELOG.md | 8 ++++++-- CMakeLists.txt | 6 +++--- docs/api.md | 4 ++-- docs/development.md | 2 +- h3/CMakeLists.txt | 2 +- .../{h3--4.1.2--unreleased.sql => h3--4.1.2--4.1.3.sql} | 2 +- h3_postgis/CMakeLists.txt | 2 +- h3_postgis/sql/install/10-operators.sql | 4 ++-- ...4.1.2--unreleased.sql => h3_postgis--4.1.2--4.1.3.sql} | 6 +++--- 9 files changed, 20 insertions(+), 16 deletions(-) rename h3/sql/updates/{h3--4.1.2--unreleased.sql => h3--4.1.2--4.1.3.sql} (90%) rename h3_postgis/sql/updates/{h3_postgis--4.1.2--unreleased.sql => h3_postgis--4.1.2--4.1.3.sql} (88%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02484478..07257387 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,10 +26,13 @@ avoid adding features or APIs which do not map onto the Click to see more. + + +## [4.1.3] - 2023-07-26 + - Add `geometry @ int` and `geography @ int` operators, as shortcuts for `h3_lat_lng_to_cell`. - Explain PostGIS SRID expectations (see [#131], thanks [@rustprooflabs]) - ## [4.1.2] - 2023-02-08 @@ -196,7 +199,8 @@ avoid adding features or APIs which do not map onto the - Initial public release -[unreleased]: https://github.com/zachasme/h3-pg/compare/v4.1.2...HEAD +[unreleased]: https://github.com/zachasme/h3-pg/compare/v4.1.3...HEAD +[4.1.3]: https://github.com/zachasme/h3-pg/compare/v4.1.2...v4.1.3 [4.1.2]: https://github.com/zachasme/h3-pg/compare/v4.1.1...v4.1.2 [4.1.1]: https://github.com/zachasme/h3-pg/compare/v4.1.0...v4.1.1 [4.1.0]: https://github.com/zachasme/h3-pg/compare/v4.0.3...v4.1.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a2c7375..17ef95b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,12 +30,12 @@ endif() # Listing the version is nice here since it sets lots of useful variables project( h3-pg - VERSION 4.1.2 + VERSION 4.1.3 LANGUAGES C ) # set this to "${PROJECT_VERSION}" on release -#set(INSTALL_VERSION "${PROJECT_VERSION}") -set(INSTALL_VERSION "unreleased") +set(INSTALL_VERSION "${PROJECT_VERSION}") +#set(INSTALL_VERSION "unreleased") set(H3_CORE_VERSION 4.1.0) set(H3_CORE_SHA256 ec99f1f5974846bde64f4513cf8d2ea1b8d172d2218ab41803bf6a63532272bc) diff --git a/docs/api.md b/docs/api.md index 82a1422d..0c676ce2 100644 --- a/docs/api.md +++ b/docs/api.md @@ -598,14 +598,14 @@ Splits polygons when crossing 180th meridian. # PostGIS Operators ### Operator: `geometry` @ `integer` -*Since vunavailable* +*Since v4.1.3* Index geometry at specified resolution. ### Operator: `geography` @ `integer` -*Since vunavailable* +*Since v4.1.3* Index geography at specified resolution. diff --git a/docs/development.md b/docs/development.md index d959c5d5..f8382463 100644 --- a/docs/development.md +++ b/docs/development.md @@ -10,7 +10,7 @@ Documentation is generated from the sql files, using the script `scripts/documen - Don't follow semver, simply use major and minor from H3 core and increment patch. - Version number should be changed in root `CMakeLists.txt`. - Set `INSTALL_VERSION` to "${PROJECT_VERSION}". - - Update files suffixed `--unreleased` should be renamed. + - Update files (and cmake references) suffixed `--unreleased` should be renamed. - Installer `.sql` files should have `@ availability` comments updated. - Update changelog by moving from `Unreleased` to a new section - Push and merge changes in `release-x.y.z` branch. diff --git a/h3/CMakeLists.txt b/h3/CMakeLists.txt index 2d4c4bbe..45dc1027 100644 --- a/h3/CMakeLists.txt +++ b/h3/CMakeLists.txt @@ -72,7 +72,7 @@ PostgreSQL_add_extension(postgresql_h3 sql/updates/h3--4.0.3--4.1.0.sql sql/updates/h3--4.1.0--4.1.1.sql sql/updates/h3--4.1.1--4.1.2.sql - sql/updates/h3--4.1.2--unreleased.sql + sql/updates/h3--4.1.2--4.1.3.sql ) # configure diff --git a/h3/sql/updates/h3--4.1.2--unreleased.sql b/h3/sql/updates/h3--4.1.2--4.1.3.sql similarity index 90% rename from h3/sql/updates/h3--4.1.2--unreleased.sql rename to h3/sql/updates/h3--4.1.2--4.1.3.sql index 7772199b..67d296e7 100644 --- a/h3/sql/updates/h3--4.1.2--unreleased.sql +++ b/h3/sql/updates/h3--4.1.2--4.1.3.sql @@ -15,7 +15,7 @@ */ -- complain if script is sourced in psql, rather than via CREATE EXTENSION -\echo Use "ALTER EXTENSION h3 UPDATE TO 'unreleased'" to load this file. \quit +\echo Use "ALTER EXTENSION h3 UPDATE TO '4.1.3'" to load this file. \quit COMMENT ON OPERATOR @> (h3index, h3index) IS 'Returns true if A contains B.'; \ No newline at end of file diff --git a/h3_postgis/CMakeLists.txt b/h3_postgis/CMakeLists.txt index 43e4f88f..8fd58330 100644 --- a/h3_postgis/CMakeLists.txt +++ b/h3_postgis/CMakeLists.txt @@ -34,7 +34,7 @@ PostgreSQL_add_extension(postgresql_h3_postgis sql/updates/h3_postgis--4.0.3--4.1.0.sql sql/updates/h3_postgis--4.1.0--4.1.1.sql sql/updates/h3_postgis--4.1.1--4.1.2.sql - sql/updates/h3_postgis--4.1.2--unreleased.sql + sql/updates/h3_postgis--4.1.2--4.1.3.sql ) # link diff --git a/h3_postgis/sql/install/10-operators.sql b/h3_postgis/sql/install/10-operators.sql index b9b3b580..80add1c0 100644 --- a/h3_postgis/sql/install/10-operators.sql +++ b/h3_postgis/sql/install/10-operators.sql @@ -16,7 +16,7 @@ --| # PostGIS Operators ---@ availability: unavailable +--@ availability: 4.1.3 CREATE OPERATOR @ ( PROCEDURE = h3_lat_lng_to_cell, LEFTARG = geometry, RIGHTARG = integer @@ -24,7 +24,7 @@ CREATE OPERATOR @ ( COMMENT ON OPERATOR @ (geometry, integer) IS 'Index geometry at specified resolution.'; ---@ availability: unavailable +--@ availability: 4.1.3 CREATE OPERATOR @ ( PROCEDURE = h3_lat_lng_to_cell, LEFTARG = geography, RIGHTARG = integer diff --git a/h3_postgis/sql/updates/h3_postgis--4.1.2--unreleased.sql b/h3_postgis/sql/updates/h3_postgis--4.1.2--4.1.3.sql similarity index 88% rename from h3_postgis/sql/updates/h3_postgis--4.1.2--unreleased.sql rename to h3_postgis/sql/updates/h3_postgis--4.1.2--4.1.3.sql index 0c337d38..13175692 100644 --- a/h3_postgis/sql/updates/h3_postgis--4.1.2--unreleased.sql +++ b/h3_postgis/sql/updates/h3_postgis--4.1.2--4.1.3.sql @@ -15,9 +15,9 @@ */ -- complain if script is sourced in psql, rather than via CREATE EXTENSION -\echo Use "ALTER EXTENSION h3 UPDATE TO 'unreleased'" to load this file. \quit +\echo Use "ALTER EXTENSION h3 UPDATE TO '4.1.3'" to load this file. \quit ---@ availability: unavailable +--@ availability: 4.1.3 CREATE OPERATOR @ ( PROCEDURE = h3_lat_lng_to_cell, LEFTARG = geometry, RIGHTARG = integer @@ -25,7 +25,7 @@ CREATE OPERATOR @ ( COMMENT ON OPERATOR @ (geometry, integer) IS 'Index geometry at specified resolution.'; ---@ availability: unavailable +--@ availability: 4.1.3 CREATE OPERATOR @ ( PROCEDURE = h3_lat_lng_to_cell, LEFTARG = geography, RIGHTARG = integer