From 7753ba6019ec873bf27b0a01fe9e5bfc65169740 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 28 Jul 2019 20:36:35 +0200 Subject: [PATCH] require python 3 for all tools used in updates --- docs/admin/Import-and-Update.md | 8 ++++---- docs/admin/Installation.md | 2 +- utils/check_server_for_updates.py | 2 +- utils/osm_file_date.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/admin/Import-and-Update.md b/docs/admin/Import-and-Update.md index 257e5ebc..923891a4 100644 --- a/docs/admin/Import-and-Update.md +++ b/docs/admin/Import-and-Update.md @@ -220,14 +220,14 @@ For a list of other methods see the output of `./utils/update.php --help`. #### Installing the newest version of Pyosmium -It is recommended to install Pyosmium via pip. Run (as the same user who -will later run the updates): +It is recommended to install Pyosmium via pip. Make sure to use python3. +Run (as the same user who will later run the updates): ```sh -pip install --user osmium +pip3 install --user osmium ``` -Nominatim needs a tool called `pyosmium-get-updates`, which comes with +Nominatim needs a tool called `pyosmium-get-updates` which comes with Pyosmium. You need to tell Nominatim where to find it. Add the following line to your `settings/local.php`: diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md index 5b7f8173..d0724927 100644 --- a/docs/admin/Installation.md +++ b/docs/admin/Installation.md @@ -50,7 +50,7 @@ For running Nominatim: For running continuous updates: - * [pyosmium](https://osmcode.org/pyosmium/) + * [pyosmium](https://osmcode.org/pyosmium/) (with Python 3) ### Hardware diff --git a/utils/check_server_for_updates.py b/utils/check_server_for_updates.py index 6e3beb83..05b69657 100755 --- a/utils/check_server_for_updates.py +++ b/utils/check_server_for_updates.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import sys from osmium.replication import server diff --git a/utils/osm_file_date.py b/utils/osm_file_date.py index 88d0a4c0..b8c54a7c 100755 --- a/utils/osm_file_date.py +++ b/utils/osm_file_date.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import osmium import sys -- 2.45.1