use place_to_be_deleted when force deleting objects

[nominatim.git] / vagrant / Install-on-Ubuntu-20.sh

diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh
index 87aad5efb9058a382ca03e7891e2efa9ceff88ea..e6ad9ca959632190265b8e0dfc9421a030cf7fde 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-20.sh
+++ b/vagrant/Install-on-Ubuntu-20.sh
@@ -27,9 +27,15 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                         postgresql-12-postgis-3 \
                         postgresql-contrib-12 postgresql-12-postgis-3-scripts \
                         php-cli php-pgsql php-intl libicu-dev python3-dotenv \
                         postgresql-12-postgis-3 \
                         postgresql-contrib-12 postgresql-12-postgis-3-scripts \
                         php-cli php-pgsql php-intl libicu-dev python3-dotenv \

-                        python3-psycopg2 python3-psutil python3-jinja2 \
+                        python3-psycopg2 python3-psutil python3-jinja2 python3-pip \

                         python3-icu python3-datrie python3-yaml git
 
                         python3-icu python3-datrie python3-yaml git
 

+# Some of the Python packages that come with Ubuntu 20.04 are too old, so
+# install the latest version from pip:
+
+    pip3 install --user sqlalchemy GeoAlchemy2 asyncpg
+
+

 #
 # System Configuration
 # ====================
 #
 # System Configuration
 # ====================


@@ -109,7 +115,7 @@ fi                                 #DOCS:
 # download the country grid:
 
 if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:    :::sh
 # download the country grid:
 
 if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:    :::sh

-    wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
+    wget -O data/country_osm_grid.sql.gz https://nominatim.org/data/country_grid.sql.gz

 fi                                 #DOCS:
 
 # The code must be built in a separate directory. Create this directory,
 fi                                 #DOCS:
 
 # The code must be built in a separate directory. Create this directory,