port unit tests to new python package layout

This commit is contained in:
Sarah Hoffmann
2024-06-09 14:52:20 +02:00
parent c903559415
commit 2bab0ca060
100 changed files with 570 additions and 557 deletions

View File

@@ -36,3 +36,5 @@ from .results import (SourceTable as SourceTable,
SearchResult as SearchResult,
SearchResults as SearchResults)
from .localization import (Locales as Locales)
from .version import NOMINATIM_API_VERSION as __version__

View File

@@ -49,6 +49,6 @@ async def make_query_analyzer(conn: SearchConnection) -> AbstractQueryAnalyzer:
log().comment(f"No tokenizer named '{name}' available. Database not set up properly.")
raise RuntimeError('Tokenizer not found')
module = importlib.import_module(f'nominatim_api.api.search.{name}_tokenizer')
module = importlib.import_module(f'nominatim_api.search.{name}_tokenizer')
return cast(AbstractQueryAnalyzer, await module.create_query_analyzer(conn))

View File

@@ -14,7 +14,7 @@ import dataclasses
import sqlalchemy as sa
from .connection import SearchConnection
from .version import NOMINATIM_API_VERSION
from .version import NOMINATIM_API_VERSION, parse_version
@dataclasses.dataclass
class StatusResult:
@@ -44,7 +44,7 @@ async def get_status(conn: SearchConnection) -> StatusResult:
# Database version
try:
status.database_version = await conn.get_property('database_version')
status.database_version = parse_version(await conn.get_property('database_version'))
except ValueError:
pass

View File

@@ -8,4 +8,6 @@
Version information for the Nominatim API.
"""
from nominatim_core.version import NominatimVersion, parse_version
NOMINATIM_API_VERSION = '4.4.99'