port unit tests to new python package layout

src/nominatim_db/cli.py

@@ -180,7 +180,7 @@ class AdminServe:
             else:
                 port = 8088
 
-            server_module = importlib.import_module(f'nominatim_db.server.{args.engine}.server')
+            server_module = importlib.import_module(f'nominatim_api.server.{args.engine}.server')
 
             app = server_module.get_application(args.project_dir)
             uvicorn.run(app, host=host, port=port)

src/nominatim_db/clicmd/api.py

@@ -7,7 +7,7 @@
 """
 Subcommand definitions for API calls from the command line.
 """
-from typing import Dict, Any
+from typing import Dict, Any, Optional
 import argparse
 import logging
 import json

src/nominatim_db/version.py

@@ -7,38 +7,9 @@
 """
 Version information for Nominatim.
 """
-from typing import Optional, NamedTuple
+from typing import Optional
 
-class NominatimVersion(NamedTuple):
-    """ Version information for Nominatim. We follow semantic versioning.
-
-        Major, minor and patch_level 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.
-
-        When adding a migration on the development branch, raise the patch level
-        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 be reapplied and set the migration version to the appropriate
-        patch level when cherry-picking the commit with the migration.
-    """
-
-    major: int
-    minor: int
-    patch_level: int
-    db_patch_level: int
-
-    def __str__(self) -> str:
-        return f"{self.major}.{self.minor}.{self.patch_level}-{self.db_patch_level}"
-
-    def release_version(self) -> str:
-        """ Return the release version in semantic versioning format.
-
-            The release version does not include the database patch version.
-        """
-        return f"{self.major}.{self.minor}.{self.patch_level}"
+from nominatim_core.version import NominatimVersion, parse_version
 
 NOMINATIM_VERSION = NominatimVersion(4, 4, 99, 1)
 
@@ -50,13 +21,3 @@ POSTGIS_REQUIRED_VERSION = (2, 2)
 # 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
-
-
-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
-
-        This is the reverse operation of `version_str()`.
-    """
-    parts = version.split('.')
-    return NominatimVersion(*[int(x) for x in parts[:2] + parts[2].split('-')])