From 3734f1d0b84c642ba89b5a4c39bac845f5627be7 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 11 Sep 2024 17:51:38 +0200 Subject: [PATCH] prepare 4.5.0 release --- CMakeLists.txt | 2 +- CONTRIBUTING.md | 6 +++++- ChangeLog | 33 ++++++++++++++++++++++++++++++++- SECURITY.md | 2 +- docs/admin/Migration.md | 2 +- src/nominatim_api/version.py | 2 +- src/nominatim_db/version.py | 2 +- 7 files changed, 42 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1c2702a..19bf6655 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") project(nominatim) set(NOMINATIM_VERSION_MAJOR 4) -set(NOMINATIM_VERSION_MINOR 4) +set(NOMINATIM_VERSION_MINOR 5) set(NOMINATIM_VERSION_PATCH 0) set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}") diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1df644e7..757c52b7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,7 +75,10 @@ relevant changes are cherry-picked from the master branch. Checklist for releases: -* [ ] increase version in `nominatim/version.py` and CMakeLists.txt +* [ ] increase versions in + * `src/nominatim_api/version.py` + * `src/nominatim_db/version.py` + * CMakeLists.txt * [ ] update `ChangeLog` (copy information from patch releases from release branch) * [ ] complete `docs/admin/Migration.md` * [ ] update EOL dates in `SECURITY.md` @@ -100,3 +103,4 @@ Checklist for releases: * compile and import Nominatim * run `nominatim --version` to confirm correct version * [ ] tag new release and add a release on github.com +* [ ] build pip packages and upload to pypi diff --git a/ChangeLog b/ChangeLog index 2f5d51d5..b7609255 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +4.5.0 + * allow building Nominatim as a pip package + * make osm2pgsql building optional + * switch importer to psycopg3 + * allow output format of web search to be customized in self-installations + * look up potential postcode areas for postcode results + * add word usage statistics for address terms + * implement more light-weight CSV format for wiki importance tables + * rewrite SQL for place search to use window functions + * increase search radius when filtering by postcode + * prefer POI points over POI areas + * reintroduce full terms for address terms in search_name table + * reindex postcodes when their parent is deleted + * indexing: precompute counts of affected rows + * ensure consistent country assignments for overlapping countries + * make Nominatim[Async]API context manager to ensure proper calling of + close() + * make usage of project dir optional for library + * drop interpolations when no parent can be found + * style tweaks to reflect OSM usage (man_made, highway and others) + * deprecation of: bundled osm2pgsql, legacy tokenizer, PHP frontend + * make documentation buildable without CMake + * various fixes and improvements to documentation + +4.4.1 + * fix geocodejson output: admin level output should only print boundaries + * updating: restrict invalidation of child objects on large street features + * restrict valid interpolation house numbers to 0-999999 + * fix import error when SQLAlchemy 1.4 and psycopg3 are installed + * various typo fixes in the documentation + 4.4.0 * add export to SQLite database and SQLite support for the frontend * switch to Python frontend as the default frontend @@ -8,7 +39,7 @@ * fix regression in search with categories where it was confused with near search * partially roll back use of SQLAlchemy lambda statements due to bugs - in SQLAchemy + in SQLAlchemy * fix handling of timezones for timestamps from the database * fix handling of full address searches in connection with a viewbox * fix postcode computation of highway areas diff --git a/SECURITY.md b/SECURITY.md index a14eba13..3ec22cbd 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -9,10 +9,10 @@ versions. | Version | End of support for security updates | | ------- | ----------------------------------- | +| 4.5.x | 2026-09-12 | | 4.4.x | 2026-03-07 | | 4.3.x | 2025-09-07 | | 4.2.x | 2024-11-24 | -| 4.1.x | 2024-08-05 | ## Reporting a Vulnerability diff --git a/docs/admin/Migration.md b/docs/admin/Migration.md index 75f89141..b407d2ef 100644 --- a/docs/admin/Migration.md +++ b/docs/admin/Migration.md @@ -20,7 +20,7 @@ breaking changes. **Please read them before running the migration.** If you are migrating from a version <3.6, then you still have to follow the manual migration steps up to 3.6. -## 4.4.0 -> master +## 4.4.0 -> 4.5.0 ### New structure for Python packages diff --git a/src/nominatim_api/version.py b/src/nominatim_api/version.py index d275f4fc..8c4de5a4 100644 --- a/src/nominatim_api/version.py +++ b/src/nominatim_api/version.py @@ -8,4 +8,4 @@ Version information for the Nominatim API. """ -NOMINATIM_API_VERSION = '4.4.99' +NOMINATIM_API_VERSION = '4.5.0' diff --git a/src/nominatim_db/version.py b/src/nominatim_db/version.py index 588a31c8..8cc8e4fe 100644 --- a/src/nominatim_db/version.py +++ b/src/nominatim_db/version.py @@ -58,7 +58,7 @@ def parse_version(version: str) -> NominatimVersion: return NominatimVersion(*[int(x) for x in parts[:2] + parts[2].split('-')]) -NOMINATIM_VERSION = parse_version('4.4.99-1') +NOMINATIM_VERSION = parse_version('4.5.0-0') POSTGRESQL_REQUIRED_VERSION = (9, 6) POSTGIS_REQUIRED_VERSION = (2, 2) -- 2.39.5