Merge pull request #3587 from danieldegroot2/lookup-spelling

[nominatim.git] / src / nominatim_db / version.py

diff --git a/src/nominatim_db/version.py b/src/nominatim_db/version.py
index 70e1ac14ac9a6bc13969ea0e0f059ceb0b078f6c..76de017dca23ae6248d91fb07fac7b77a083ffa9 100644 (file)
--- a/src/nominatim_db/version.py
+++ b/src/nominatim_db/version.py
@@ -9,8 +9,6 @@ Version information for Nominatim.
 """
 from typing import NamedTuple, Optional
 
 """
 from typing import NamedTuple, Optional
 

-# See also https://github.com/PyCQA/pylint/issues/6006
-# pylint: disable=useless-import-alias,unused-import

 
 class NominatimVersion(NamedTuple):
     """ Version information for Nominatim. We follow semantic versioning.
 
 class NominatimVersion(NamedTuple):
     """ Version information for Nominatim. We follow semantic versioning.


@@ -31,7 +29,7 @@ class NominatimVersion(NamedTuple):
     major: int
     minor: int
     patch_level: int
     major: int
     minor: int
     patch_level: int

-    db_patch_level: Optional[int]
+    db_patch_level: int

 
     def __str__(self) -> str:
         if self.db_patch_level is None:
 
     def __str__(self) -> str:
         if self.db_patch_level is None:


@@ -57,13 +55,14 @@ def parse_version(version: str) -> NominatimVersion:
     return NominatimVersion(*[int(x) for x in parts[:2] + parts[2].split('-')])
 
 
     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)
 
 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.
 
 # 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
+GIT_COMMIT_HASH: Optional[str] = None