Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/nominatim_db/version.py b/src/nominatim_db/version.py
index 70e1ac14ac9a6bc13969ea0e0f059ceb0b078f6c..8cc8e4fe3e0155619edd23453c92b67f19d93b63 100644 (file)
--- a/src/nominatim_db/version.py
+++ b/src/nominatim_db/version.py
@@ -31,7 +31,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:


@@ -47,6 +47,7 @@ class NominatimVersion(NamedTuple):
         return f"{self.major}.{self.minor}.{self.patch_level}"
 
 
         return f"{self.major}.{self.minor}.{self.patch_level}"
 
 

+

 def parse_version(version: str) -> NominatimVersion:
     """ Parse a version string into a version consisting of a tuple of
         four ints: major, minor, patch level, database patch level
 def parse_version(version: str) -> NominatimVersion:
     """ Parse a version string into a version consisting of a tuple of
         four ints: major, minor, patch level, database patch level


@@ -57,10 +58,11 @@ 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 sets a variable @GIT_HASH@ by executing 'git --log'. It is not run
 # on every execution of 'make'.