solve assorted issue with newer pylint versions

[nominatim.git] / nominatim / version.py

diff --git a/nominatim/version.py b/nominatim/version.py
index cb7f59bc8a5ea5037f25f88e5d3ac79aa58d0649..88d42af923f01e6bd812fa5b842a7b7988616551 100644 (file)
--- a/nominatim/version.py
+++ b/nominatim/version.py
@@ -20,11 +20,25 @@ Version information for Nominatim.
 # to 99 to make sure that the migration is applied when updating from a
 # patch release to the next minor version. Patch releases usually shouldn't
 # have migrations in them. When they are needed, then make sure that the
-# migration can reapplied and set the migration version to the appropriate
+# migration can be reapplied and set the migration version to the appropriate
 # 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, 1)
+NOMINATIM_VERSION = (4, 0, 99, 6)
 
 POSTGRESQL_REQUIRED_VERSION = (9, 5)
 POSTGIS_REQUIRED_VERSION = (2, 2)
+
+# Cmake sets a variabe @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 = None
+
+
+# pylint: disable=consider-using-f-string
+def version_str(version=NOMINATIM_VERSION):
+    """
+    Return a human-readable string of the version.
+    """
+    return '{}.{}.{}-{}'.format(*version)