reduce from 3 to 2 packages

test/python/tools/test_admin.py

@@ -9,10 +9,10 @@ Tests for maintenance and analysis functions.
 """
 import pytest
 
-from nominatim_core.errors import UsageError
+from nominatim_db.errors import UsageError
 from nominatim_db.tools import admin
 from nominatim_db.tokenizer import factory
-from nominatim_core.db.sql_preprocessor import SQLPreprocessor
+from nominatim_db.db.sql_preprocessor import SQLPreprocessor
 
 @pytest.fixture(autouse=True)
 def create_placex_table(project_env, tokenizer_mock, temp_db_cursor, placex_table):

test/python/tools/test_database_import.py

@@ -14,7 +14,7 @@ import pytest
 import psycopg2
 
 from nominatim_db.tools import database_import
-from nominatim_core.errors import UsageError
+from nominatim_db.errors import UsageError
 
 class TestDatabaseSetup:
     DBNAME = 'test_nominatim_python_unittest'

test/python/tools/test_exec_utils.py

@@ -12,7 +12,7 @@ import subprocess
 
 import pytest
 
-from nominatim_core.config import Configuration
+from nominatim_db.config import Configuration
 import nominatim_db.tools.exec_utils as exec_utils
 
 def test_run_osm2pgsql(osm2pgsql_options):

test/python/tools/test_import_special_phrases.py

@@ -13,7 +13,7 @@ import pytest
 from nominatim_db.tools.special_phrases.sp_importer import SPImporter
 from nominatim_db.tools.special_phrases.sp_wiki_loader import SPWikiLoader
 from nominatim_db.tools.special_phrases.special_phrase import SpecialPhrase
-from nominatim_core.errors import UsageError
+from nominatim_db.errors import UsageError
 
 from cursor import CursorForTesting
 

test/python/tools/test_migration.py

@@ -11,7 +11,7 @@ import pytest
 import psycopg2.extras
 
 from nominatim_db.tools import migration
-from nominatim_core.errors import UsageError
+from nominatim_db.errors import UsageError
 import nominatim_db.version
 
 from mock_legacy_word_table import MockLegacyWordTable

test/python/tools/test_replication.py

@@ -14,8 +14,8 @@ import pytest
 from osmium.replication.server import OsmosisState
 
 import nominatim_db.tools.replication
-import nominatim_core.db.status as status
-from nominatim_core.errors import UsageError
+import nominatim_db.db.status as status
+from nominatim_db.errors import UsageError
 
 OSM_NODE_DATA = """\
 <osm version="0.6" generator="OpenStreetMap server" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">

test/python/tools/test_sp_csv_loader.py

@@ -9,7 +9,7 @@
 """
 import pytest
 
-from nominatim_core.errors import UsageError
+from nominatim_db.errors import UsageError
 from nominatim_db.tools.special_phrases.sp_csv_loader import SPCsvLoader
 from nominatim_db.tools.special_phrases.special_phrase import SpecialPhrase
 

test/python/tools/test_tiger_data.py

@@ -13,7 +13,7 @@ from textwrap import dedent
 import pytest
 
 from nominatim_db.tools import tiger_data, freeze
-from nominatim_core.errors import UsageError
+from nominatim_db.errors import UsageError
 
 class MockTigerTable: