remove tests that differ between lua and gazetteer versions

[nominatim.git] / nominatim / version.py

diff --git a/nominatim/version.py b/nominatim/version.py
index d4f69da14ff149d57dcec7d77fef82d8360df69e..36573040f99e41924553029cf59657b296820100 100644 (file)
--- a/nominatim/version.py
+++ b/nominatim/version.py
@@ -7,6 +7,7 @@
 """
 Version information for Nominatim.
 """
 """
 Version information for Nominatim.
 """

+from typing import Optional, Tuple

 
 # Version information: major, minor, patch level, database patch level
 #
 
 # Version information: major, minor, patch level, database patch level
 #


@@ -24,21 +25,21 @@ Version information for Nominatim.
 # patch level when cherry-picking the commit with the migration.
 #
 # Released versions always have a database patch level of 0.
 # patch level when cherry-picking the commit with the migration.
 #
 # Released versions always have a database patch level of 0.

-NOMINATIM_VERSION = (4, 0, 99, 6)
+NOMINATIM_VERSION = (4, 1, 99, 0)

 
 

-POSTGRESQL_REQUIRED_VERSION = (9, 5)
+POSTGRESQL_REQUIRED_VERSION = (9, 6)

 POSTGIS_REQUIRED_VERSION = (2, 2)
 
 POSTGIS_REQUIRED_VERSION = (2, 2)
 

-# Cmake sets a variabe @GIT_HASH@ by executing 'git --log'. It is not run
+# 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.
 # 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 = None
+GIT_COMMIT_HASH : Optional[str] = None

 
 
 # pylint: disable=consider-using-f-string
 
 
 # pylint: disable=consider-using-f-string

-def version_str():
+def version_str(version:Tuple[int, int, int, int] = NOMINATIM_VERSION) -> str:

     """
     Return a human-readable string of the version.
     """
     """
     Return a human-readable string of the version.
     """

-    return '{}.{}.{}-{}'.format(*NOMINATIM_VERSION)
+    return '{}.{}.{}-{}'.format(*version)