X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6e89310a9285f1ad15d8002bf68f578eada367a0..23369ce9704d3815faae22697338916a60ddf682:/src/nominatim_db/version.py diff --git a/src/nominatim_db/version.py b/src/nominatim_db/version.py index ca383c85..76de017d 100644 --- a/src/nominatim_db/version.py +++ b/src/nominatim_db/version.py @@ -7,7 +7,8 @@ """ Version information for Nominatim. """ -from typing import Optional, NamedTuple +from typing import NamedTuple, Optional + class NominatimVersion(NamedTuple): """ Version information for Nominatim. We follow semantic versioning. @@ -31,6 +32,9 @@ class NominatimVersion(NamedTuple): db_patch_level: int def __str__(self) -> str: + if self.db_patch_level is None: + return f"{self.major}.{self.minor}.{self.patch_level}" + return f"{self.major}.{self.minor}.{self.patch_level}-{self.db_patch_level}" def release_version(self) -> str: @@ -40,17 +44,6 @@ class NominatimVersion(NamedTuple): """ return f"{self.major}.{self.minor}.{self.patch_level}" -NOMINATIM_VERSION = NominatimVersion(4, 4, 99, 1) - -POSTGRESQL_REQUIRED_VERSION = (9, 6) -POSTGIS_REQUIRED_VERSION = (2, 2) - -# Cmake sets a variable @GIT_HASH@ by executing 'git --log'. It is not run -# on every execution of 'make'. -# cmake/tool-installed.tmpl is used to build the binary 'nominatim'. Inside -# there is a call to set the variable value below. -GIT_COMMIT_HASH : Optional[str] = None - def parse_version(version: str) -> NominatimVersion: """ Parse a version string into a version consisting of a tuple of @@ -60,3 +53,16 @@ def parse_version(version: str) -> NominatimVersion: """ parts = version.split('.') return NominatimVersion(*[int(x) for x in parts[:2] + parts[2].split('-')]) + + +NOMINATIM_VERSION = parse_version('4.5.0-0') + +POSTGRESQL_REQUIRED_VERSION = (9, 6) +POSTGIS_REQUIRED_VERSION = (2, 2) +OSM2PGSQL_REQUIRED_VERSION = (1, 8) + +# Cmake sets a variable @GIT_HASH@ by executing 'git --log'. It is not run +# on every execution of 'make'. +# cmake/tool-installed.tmpl is used to build the binary 'nominatim'. Inside +# there is a call to set the variable value below. +GIT_COMMIT_HASH: Optional[str] = None