From 3064ee8e6926e79a0cca6e5ea17e4db2150b7fe8 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 7 Aug 2018 22:58:01 +0200 Subject: [PATCH] nominatim: switch pyosmium from pip to packaged version --- cookbooks/nominatim/metadata.rb | 1 - cookbooks/nominatim/recipes/default.rb | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cookbooks/nominatim/metadata.rb b/cookbooks/nominatim/metadata.rb index 20f5012c9..37d66d7aa 100644 --- a/cookbooks/nominatim/metadata.rb +++ b/cookbooks/nominatim/metadata.rb @@ -10,4 +10,3 @@ depends "apache" depends "postgresql" depends "git" depends "fail2ban" -depends "python" diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 128bb34cf..66eda9587 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -135,7 +135,6 @@ end ## Nominatim backend include_recipe "git" -include_recipe "python" package "build-essential" package "cmake" @@ -143,7 +142,6 @@ package "g++" package "libboost-dev" package "libboost-system-dev" package "libboost-filesystem-dev" -package "libboost-python-dev" package "libexpat1-dev" package "zlib1g-dev" package "libxml2-dev" @@ -151,9 +149,7 @@ package "libbz2-dev" package "libpq-dev" package "libgeos++-dev" package "libproj-dev" -package "osmosis" - -python_package "osmium" +package "pyosmium" source_directory = "#{basedir}/nominatim" build_directory = "#{basedir}/bin" -- 2.39.5