reduce from 3 to 2 packages

packaging/nominatim-api/extra_src/paths.py

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2024 by the Nominatim developer community.
+# For a full list of authors see the git log.
+"""
+Path settings for extra data used by Nominatim.
+"""
+from pathlib import Path
+
+PHPLIB_DIR = None
+DATA_DIR = None
+SQLLIB_DIR = None
+CONFIG_DIR = (Path(__file__) / '..' / 'resources' / 'settings').resolve()

packaging/nominatim-api/pyproject.toml

@@ -14,7 +14,8 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "nominatim-core",
+    "python-dotenv",
+    "pyYAML>=5.1",
     "SQLAlchemy>=1.4.31",
     "psycopg",
     "PyICU"
@@ -34,8 +35,21 @@ path = "src/nominatim_api/version.py"
 pattern = "NOMINATIM_API_VERSION = '(?P<version>[^']+)'"
 
 [tool.hatch.build.targets.sdist]
-include = ["src/nominatim_api"]
+include = [
+    "src/nominatim_api",
+    "src/nominatim_db/config.py",
+    "settings",
+    "extra_src/paths.py"
+]
+
+exclude = [
+  "src/nominatim_api/config.py"
+]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/nominatim_api"]
 
+[tool.hatch.build.targets.wheel.force-include]
+"src/nominatim_db/config.py" = "nominatim_api/config.py"
+"extra_src/paths.py" = "nominatim_api/paths.py"
+"settings" = "nominatim_api/resources/settings"

packaging/nominatim-core/COPYING

@@ -1 +0,0 @@
-../../COPYING

packaging/nominatim-core/README.md

@@ -1,24 +0,0 @@
-Nominatim - Core Package
-=========
-
-Nominatim is a tool to search OpenStreetMap data
-by name and address (geocoding) and to generate synthetic addresses of
-OSM points (reverse geocoding).
-
-This is the core pacakage containing resources and code shared by
-Nominatim's frontend `nominatim-api` and backend `nominatim-db`. You
-usually don't want to install this package directly.
-
-Documentation
-=============
-
-The documentation of the latest development version is in the
-`docs/` subdirectory. A HTML version can be found at
-https://nominatim.org/release-docs/develop/ .
-
-License
-=======
-
-The Python source code is available under a GPL license version 3 or later.
-The Lua configuration files for osm2pgsql are released under the
-Apache License, Version 2.0. All other files are under a GPLv2 license.

packaging/nominatim-core/data

@@ -1 +0,0 @@
-../../data

packaging/nominatim-core/pyproject.toml

@@ -1,60 +0,0 @@
-[project]
-name = "nominatim-core"
-description = "A tool for building a database of OpenStreetMap for geocoding and for searching the database. Base package for common resources for the project."
-readme = "README.md"
-requires-python = ">=3.7"
-license = 'GPL-3.0-or-later'
-maintainers = [
-  { name = "Sarah Hoffmann", email = "lonvia@denofr.de" }
-]
-keywords = [ "geocoding", "OpenStreetMap", "search" ]
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: GNU General Public License (GPL)",
-    "Operating System :: OS Independent",
-]
-dependencies = [
-    "python-dotenv",
-    "jinja2",
-    "pyYAML>=5.1",
-    "datrie"
-]
-dynamic = ["version"]
-
-[project.urls]
-Homepage = "https://nominatim.org"
-Issues = "https://github.com/osm-search/Nominatim/issues"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.version]
-source = "code"
-path = "src/nominatim_core/version.py"
-expression = "NOMINATIM_CORE_VERSION"
-
-[tool.hatch.build.targets.sdist]
-include = [
-  "src/nominatim_core",
-  "lib-sql/**.sql",
-  "settings",
-  "data/words.sql",
-  "extra_src/nominatim_core/paths.py"
-]
-artifacts = [
-  "data/country_osm_grid.sql.gz"
-]
-exclude = [
-  "src/nominatim_core/paths.py"
-]
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/nominatim_core"]
-
-[tool.hatch.build.targets.wheel.force-include]
-"lib-sql" = "nominatim_core/resources/lib-sql"
-"settings" = "nominatim_core/resources/settings"
-"data/country_osm_grid.sql.gz" = "nominatim_core/resources/country_osm_grid.sql.gz"
-"data/words.sql" = "nominatim_core/resources/words.sql"
-"extra_src/nominatim_core/paths.py" = "nominatim_core/paths.py"

packaging/nominatim-core/src

@@ -1 +0,0 @@
-../../src

packaging/nominatim-db/data

@@ -0,0 +1 @@
+../../data/

packaging/nominatim-db/pyproject.toml

@@ -14,8 +14,11 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "nominatim-core",
     "psycopg2-binary",
+    "python-dotenv",
+    "jinja2",
+    "pyYAML>=5.1",
+    "datrie",
     "psutil",
     "PyICU"
 ]
@@ -24,6 +27,7 @@ dynamic = ["version"]
 [project.urls]
 Homepage = "https://nominatim.org"
 Issues = "https://github.com/osm-search/Nominatim/issues"
+Documentation = "https://nominatim.org/release-docs/latest/"
 
 [build-system]
 requires = ["hatchling"]
@@ -34,10 +38,32 @@ path = "src/nominatim_db/version.py"
 pattern = "NOMINATIM_VERSION = parse_version.'(?P<version>[^-]+)"
 
 [tool.hatch.build.targets.sdist]
-include = ["src/nominatim_db", "scripts"]
+include = [
+    "src/nominatim_db",
+    "scripts",
+    "lib-sql/**/*.sql",
+    "settings",
+    "data/words.sql",
+    "extra_src/nominatim_db/paths.py"
+]
+
+artifacts = [
+  "data/country_osm_grid.sql.gz"
+]
+
+exclude = [
+  "src/nominatim_db/paths.py"
+]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/nominatim_db"]
 
 [tool.hatch.build.targets.wheel.shared-scripts]
 "scripts" = "/"
+
+[tool.hatch.build.targets.wheel.force-include]
+"lib-sql" = "nominatim_db/resources/lib-sql"
+"settings" = "nominatim_db/resources/settings"
+"data/country_osm_grid.sql.gz" = "nominatim_db/resources/country_osm_grid.sql.gz"
+"data/words.sql" = "nominatim_db/resources/words.sql"
+"extra_src/nominatim_db/paths.py" = "nominatim_db/paths.py"

packaging/nominatim-db/settings

@@ -0,0 +1 @@
+../../settings/