reduce from 3 to 2 packages

src/nominatim_db/clicmd/admin.py

@@ -11,8 +11,8 @@ import logging
 import argparse
 import random
 
-from nominatim_core.errors import UsageError
-from nominatim_core.db.connection import connect
+from ..errors import UsageError
+from ..db.connection import connect
 from .args import NominatimArgs
 
 # Do not repeat documentation of subcommand classes.

src/nominatim_db/clicmd/api.py

@@ -14,12 +14,12 @@ import json
 import sys
 from functools import reduce
 
-from nominatim_core.errors import UsageError
 import nominatim_api as napi
 import nominatim_api.v1 as api_output
 from nominatim_api.v1.helpers import zoom_to_rank, deduplicate_results
 from nominatim_api.v1.format import dispatch as formatting
 import nominatim_api.logging as loglib
+from ..errors import UsageError
 from .args import NominatimArgs
 
 # Do not repeat documentation of subcommand classes.

src/nominatim_db/clicmd/args.py

@@ -12,9 +12,9 @@ import argparse
 import logging
 from pathlib import Path
 
-from nominatim_core.errors import UsageError
-from nominatim_core.config import Configuration
-from nominatim_core.typing import Protocol
+from ..errors import UsageError
+from ..config import Configuration
+from ..typing import Protocol
 
 LOG = logging.getLogger()
 

src/nominatim_db/clicmd/convert.py

@@ -12,7 +12,7 @@ import argparse
 import asyncio
 from pathlib import Path
 
-from nominatim_core.errors import UsageError
+from ..errors import UsageError
 from .args import NominatimArgs
 
 # Do not repeat documentation of subcommand classes.

src/nominatim_db/clicmd/export.py

@@ -14,12 +14,13 @@ import asyncio
 import csv
 import sys
 
-import sqlalchemy as sa
-
 import nominatim_api as napi
 from nominatim_api.results import create_from_placex_row, ReverseResult, add_result_details
 from nominatim_api.types import LookupDetails
-from nominatim_core.errors import UsageError
+
+import sqlalchemy as sa # pylint: disable=C0411
+
+from ..errors import UsageError
 from .args import NominatimArgs
 
 # Do not repeat documentation of subcommand classes.

src/nominatim_db/clicmd/freeze.py

@@ -9,7 +9,7 @@ Implementation of the 'freeze' subcommand.
 """
 import argparse
 
-from nominatim_core.db.connection import connect
+from ..db.connection import connect
 from .args import NominatimArgs
 
 # Do not repeat documentation of subcommand classes.

src/nominatim_db/clicmd/index.py

@@ -11,8 +11,8 @@ import argparse
 
 import psutil
 
-from nominatim_core.db import status
-from nominatim_core.db.connection import connect
+from ..db import status
+from ..db.connection import connect
 from .args import NominatimArgs
 
 # Do not repeat documentation of subcommand classes.

src/nominatim_db/clicmd/refresh.py

@@ -12,8 +12,8 @@ import argparse
 import logging
 from pathlib import Path
 
-from nominatim_core.config import Configuration
-from nominatim_core.db.connection import connect
+from ..config import Configuration
+from ..db.connection import connect
 from ..tokenizer.base import AbstractTokenizer
 from .args import NominatimArgs
 

src/nominatim_db/clicmd/replication.py

@@ -14,9 +14,9 @@ import logging
 import socket
 import time
 
-from nominatim_core.db import status
-from nominatim_core.db.connection import connect
-from nominatim_core.errors import UsageError
+from ..db import status
+from ..db.connection import connect
+from ..errors import UsageError
 from .args import NominatimArgs
 
 LOG = logging.getLogger()

src/nominatim_db/clicmd/setup.py

@@ -14,10 +14,10 @@ from pathlib import Path
 
 import psutil
 
-from nominatim_core.errors import UsageError
-from nominatim_core.config import Configuration
-from nominatim_core.db.connection import connect
-from nominatim_core.db import status, properties
+from ..errors import UsageError
+from ..config import Configuration
+from ..db.connection import connect
+from ..db import status, properties
 from ..tokenizer.base import AbstractTokenizer
 from ..version import NOMINATIM_VERSION
 from .args import NominatimArgs

src/nominatim_db/clicmd/special_phrases.py

@@ -11,8 +11,8 @@ import argparse
 import logging
 from pathlib import Path
 
-from nominatim_core.errors import UsageError
-from nominatim_core.db.connection import connect
+from ..errors import UsageError
+from ..db.connection import connect
 from ..tools.special_phrases.sp_importer import SPImporter, SpecialPhraseLoader
 from ..tools.special_phrases.sp_wiki_loader import SPWikiLoader
 from ..tools.special_phrases.sp_csv_loader import SPCsvLoader