introduce database patch level for version

This will be needed later for automatic migrations.

diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py
index b476c1231d130099bf1ca3ee321bcceaf52d382e..e6b9d8d4d15f032cfc1bdf3312f764546b6960f7 100644 (file)
--- a/nominatim/tools/exec_utils.py
+++ b/nominatim/tools/exec_utils.py
@@ -134,7 +134,7 @@ def run_osm2pgsql(options):
 def get_url(url):
     """ Get the contents from the given URL and return it as a UTF-8 string.
     """
 def get_url(url):
     """ Get the contents from the given URL and return it as a UTF-8 string.
     """

-    headers = {"User-Agent" : "Nominatim/" + NOMINATIM_VERSION}
+    headers = {"User-Agent" : "Nominatim/{0[0]}.{0[1]}.{0[2]}-{0[3]}".format(NOMINATIM_VERSION)}

 
     try:
         with urlrequest.urlopen(urlrequest.Request(url, headers=headers)) as response:
 
     try:
         with urlrequest.urlopen(urlrequest.Request(url, headers=headers)) as response:

diff --git a/nominatim/version.py b/nominatim/version.py
index 8d1c6849cf80a4fb334a9096414b2b934c197722..e7f31a12b5ab4dcebcfed07e9a32effdb1e716c4 100644 (file)
--- a/nominatim/version.py
+++ b/nominatim/version.py
@@ -2,7 +2,15 @@
 Version information for Nominatim.
 """
 
 Version information for Nominatim.
 """
 

-NOMINATIM_VERSION = "3.6.0"
+# Version information: major, minor, patch level, database patch level
+#
+# The first three numbers refer to the last released version.
+#
+# The database patch level tracks important changes between releases
+# and must always be increased when there is a change to the database or code
+# that requires a migration.
+# Released versions always have a database patch level of 0.
+NOMINATIM_VERSION = (3, 6, 0, 0)

 
 POSTGRESQL_REQUIRED_VERSION = (9, 3)
 POSTGIS_REQUIRED_VERSION = (2, 2)
 
 POSTGRESQL_REQUIRED_VERSION = (9, 3)
 POSTGIS_REQUIRED_VERSION = (2, 2)