From 919469c8fe6e67f7140f53916be048a9d1d87512 Mon Sep 17 00:00:00 2001 From: AntoJvlt Date: Mon, 22 Mar 2021 01:46:46 +0100 Subject: [PATCH] Updated documentation for PyICU support --- docs/admin/Installation.md | 2 ++ vagrant/Install-on-Centos-7.sh | 4 ++-- vagrant/Install-on-Centos-8.sh | 4 ++-- vagrant/Install-on-Ubuntu-18.sh | 4 ++-- vagrant/Install-on-Ubuntu-20.sh | 5 ++++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md index eadaaff1..6237a9d4 100644 --- a/docs/admin/Installation.md +++ b/docs/admin/Installation.md @@ -30,6 +30,7 @@ For compiling: * [proj](https://proj.org/) * [bzip2](http://www.bzip.org/) * [zlib](https://www.zlib.net/) + * [ICU](http://site.icu-project.org/) * [Boost libraries](https://www.boost.org/), including system and filesystem * PostgreSQL client libraries * a recent C++ compiler (gcc 5+ or Clang 3.8+) @@ -43,6 +44,7 @@ For running Nominatim: * [Python Dotenv](https://github.com/theskumar/python-dotenv) * [psutil](https://github.com/giampaolo/psutil) * [Jinja2](https://palletsprojects.com/p/jinja/) + * [PyICU](https://pypi.org/project/PyICU/) * [PHP](https://php.net) (7.0 or later) * PHP-pgsql * PHP-intl (bundled with PHP) diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh index 24d88926..610bbb04 100755 --- a/vagrant/Install-on-Centos-7.sh +++ b/vagrant/Install-on-Centos-7.sh @@ -40,9 +40,9 @@ php-pgsql php php-intl libpqxx-devel \ proj-epsg bzip2-devel proj-devel boost-devel \ python3-pip python3-setuptools python3-devel \ - expat-devel zlib-devel + expat-devel zlib-devel libicu-dev - pip3 install --user psycopg2 python-dotenv psutil Jinja2 + pip3 install --user psycopg2 python-dotenv psutil Jinja2 PyICU # diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh index 859c48b9..17d07aec 100755 --- a/vagrant/Install-on-Centos-8.sh +++ b/vagrant/Install-on-Centos-8.sh @@ -33,9 +33,9 @@ php-pgsql php php-intl php-json libpq-devel \ bzip2-devel proj-devel boost-devel \ python3-pip python3-setuptools python3-devel \ - expat-devel zlib-devel + expat-devel zlib-devel libicu-dev - pip3 install --user psycopg2 python-dotenv psutil Jinja2 + pip3 install --user psycopg2 python-dotenv psutil Jinja2 PyICU # diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh index 5cbbd583..eb1bdc82 100755 --- a/vagrant/Install-on-Ubuntu-18.sh +++ b/vagrant/Install-on-Ubuntu-18.sh @@ -30,12 +30,12 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: postgresql-server-dev-10 postgresql-10-postgis-2.4 \ postgresql-contrib-10 postgresql-10-postgis-scripts \ php php-pgsql php-intl python3-pip \ - python3-psycopg2 python3-psutil python3-jinja2 git + python3-psycopg2 python3-psutil python3-jinja2 git libicu-dev # The python-dotenv package that comes with Ubuntu 18.04 is too old, so # install the latest version from pip: - pip3 install python-dotenv + pip3 install python-dotenv PyICU # # System Configuration diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index 0649c9a6..2b7a6a1b 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -33,7 +33,10 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: postgresql-server-dev-12 postgresql-12-postgis-3 \ postgresql-contrib-12 postgresql-12-postgis-3-scripts \ php php-pgsql php-intl python3-dotenv \ - python3-psycopg2 python3-psutil python3-jinja2 git + python3-psycopg2 python3-psutil python3-jinja2 git libicu-dev +#Python packages: + + pip3 install PyICU # # System Configuration -- 2.39.5