hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch to symlink approach for packages

Browse Source 
Needed to make building work from sdist and source directory.
This commit is contained in:
Sarah Hoffmann
2024-06-19 22:42:15 +02:00
parent a93ec09932
commit 1e88321371
15 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
*.log *.log
*.pyc *.pyc
*.swp
docs/develop/*.png docs/develop/*.png

1
packaging/nominatim-api/COPYING Symbolic link
View File

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

11
packaging/nominatim-api/pyproject.toml
View File

@@ -30,15 +30,12 @@ requires = ["hatchling"]
build-backend = "hatchling.build" build-backend = "hatchling.build"
[tool.hatch.version] [tool.hatch.version]
path = "../../src/nominatim_api/version.py" path = "src/nominatim_api/version.py"
pattern = "NOMINATIM_API_VERSION = '(?P<version>[^']+)'" pattern = "NOMINATIM_API_VERSION = '(?P<version>[^']+)'"
[tool.hatch.build.targets.sdist.force-include] [tool.hatch.build.targets.sdist]
"../../src/nominatim_db" = "nominatim_api" include = ["src/nominatim_api"]
[tool.hatch.build.targets.sdist.sources]
"src/nominatim_core" = "nominatim_api"
[tool.hatch.build.targets.wheel] [tool.hatch.build.targets.wheel]
packages = ["nominatim_api"] packages = ["src/nominatim_api"]

1
packaging/nominatim-api/src Symbolic link
View File

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

1
packaging/nominatim-core/COPYING Symbolic link
View File

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

1
packaging/nominatim-core/data Symbolic link
View File

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

0
packaging/nominatim-core/src/nominatim_core/paths.py → packaging/nominatim-core/extra_src/nominatim_core/paths.py
View File

1
packaging/nominatim-core/lib-sql Symbolic link
View File

@@ -0,0 +1 @@
../../lib-sql/

38
packaging/nominatim-core/pyproject.toml
View File

@@ -30,19 +30,31 @@ requires = ["hatchling"]
build-backend = "hatchling.build" build-backend = "hatchling.build"
[tool.hatch.version] [tool.hatch.version]
path = "../../src/nominatim_core/version.py" source = "code"
pattern = "NOMINATIM_CORE_VERSION = '(?P<version>[^']+)'" path = "src/nominatim_core/version.py"
expression = "NOMINATIM_CORE_VERSION"
[tool.hatch.build.targets.sdist.force-include] [tool.hatch.build.targets.sdist]
"../../src/nominatim_core" = "nominatim_core" include = [
"../../lib-sql" = "nominatim_core/resources/lib-sql" "src/nominatim_core",
"../../settings" = "nominatim_core/resources/settings" "lib-sql/**.sql",
"../../data/country_osm_grid.sql.gz" = "nominatim_core/resources/country_osm_grid.sql.gz" "settings",
"../../data/words.sql" = "nominatim_core/resources/words.sql" "data/words.sql",
"src/nominatim_core/paths.py" = "nominatim_core/paths.py" "extra_src/nominatim_core/paths.py"
]
[tool.hatch.build.targets.sdist.sources] artifacts = [
"src/nominatim_core" = "nominatim_core" "data/country_osm_grid.sql.gz"
]
exclude = [
"src/nominatim_core/paths.py"
]
[tool.hatch.build.targets.wheel] [tool.hatch.build.targets.wheel]
packages = ["nominatim_core"] 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"

1
packaging/nominatim-core/settings Symbolic link
View File

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

1
packaging/nominatim-core/src Symbolic link
View File

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

1
packaging/nominatim-db/COPYING Symbolic link
View File

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

13
packaging/nominatim-db/pyproject.toml
View File

@@ -30,19 +30,14 @@ requires = ["hatchling"]
build-backend = "hatchling.build" build-backend = "hatchling.build"
[tool.hatch.version] [tool.hatch.version]
path = "../../src/nominatim_db/version.py" path = "src/nominatim_db/version.py"
pattern = "NOMINATIM_VERSION = parse_version.'(?P<version>[^-]+)" pattern = "NOMINATIM_VERSION = parse_version.'(?P<version>[^-]+)"
[tool.hatch.build.targets.sdist.force-include] [tool.hatch.build.targets.sdist]
"../../src/nominatim_db" = "nominatim_db" include = ["src/nominatim_db", "scripts"]
[tool.hatch.build.targets.sdist.sources]
"src/nominatim_core" = "nominatim_db"
"scripts" = "scripts"
[tool.hatch.build.targets.wheel] [tool.hatch.build.targets.wheel]
packages = ["nominatim_db"] packages = ["src/nominatim_db"]
[tool.hatch.build.targets.wheel.shared-scripts] [tool.hatch.build.targets.wheel.shared-scripts]
"scripts" = "/" "scripts" = "/"

1
packaging/nominatim-db/src Symbolic link
View File

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

3
src/nominatim_core/version.py
View File

@@ -9,7 +9,8 @@ Version information for the Nominatim core package.
""" """
from typing import NamedTuple, Optional from typing import NamedTuple, Optional
NOMINATIM_CORE_VERSION = '4.4.99' __version__ = '4.4.99'
NOMINATIM_CORE_VERSION = __version__
class NominatimVersion(NamedTuple): class NominatimVersion(NamedTuple):
""" Version information for Nominatim. We follow semantic versioning. """ Version information for Nominatim. We follow semantic versioning.