Merge pull request #1444 from lonvia/require-python-3

Require python 3

diff --git a/data-sources/us-tiger/README.md b/data-sources/us-tiger/README.md
index e75a9efa61386bdf011cd8158c6ed97c11062cfd..dfb44c5ff8f39478b394cee2f89f91d01c8e1ae2 100644 (file)
--- a/data-sources/us-tiger/README.md
+++ b/data-sources/us-tiger/README.md
@@ -9,9 +9,7 @@ Replace '2018' with the current year throughout.
   1. Install the GDAL library and python bindings and the unzip tool
 
         # Ubuntu:
-        sudo apt-get install python-gdal unzip
-        # CentOS:
-        sudo yum install gdal-python unzip
+        sudo apt-get install python3-gdal unzip
 
   2. Get the TIGER 2018 data. You will need the EDGES files
      (3,233 zip files, 11GB total).
@@ -22,8 +20,7 @@ Replace '2018' with the current year throughout.
 
         cd data-sources/us-tiger
         ./convert.sh <input-path> <output-path>
-        
+
   4. Maybe: package the created files
-  
+
         tar -czf tiger2018-nominatim-preprocessed.tar.gz tiger
-        
\ No newline at end of file

diff --git a/data-sources/us-tiger/tiger_address_convert.py b/data-sources/us-tiger/tiger_address_convert.py
index b1e2eb0cec8984813a2eacec1686d3a837b06af7..ebe265ed8ac4b832f58aadc1929251da319a510d 100755 (executable)
--- a/data-sources/us-tiger/tiger_address_convert.py
+++ b/data-sources/us-tiger/tiger_address_convert.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Tiger road data to OSM conversion script
 # Creates Karlsruhe-style address ways beside the main way
 # based on the Massachusetts GIS script by christopher schmidt
@@ -164,7 +164,7 @@ def parse_shp_for_geom_and_tags( filename ):
         if (statefp != None) and (countyfp != None):
             county_name = county_fips_data.get(statefp + '' + countyfp)
             if county_name:
-                tags["tiger:county"] = county_name.encode("utf-8")
+                tags["tiger:county"] = county_name
 
         # tlid = poFeature.GetField("TLID")
         # if tlid != None:

diff --git a/docs/admin/Import-and-Update.md b/docs/admin/Import-and-Update.md
index 257e5ebcc5e591245a773554e59fcb4f859c1db3..923891a4fe728d8d9dd9b381a99f87f6ef58fc7b 100644 (file)
--- 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 5b7f8173795934fcf98ceea84fe8b7b4051ed5d9..d07249276177c8413bc8dd48c584929ba6dd068a 100644 (file)
--- 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 6e3beb83c3acb4f10aebb5b925b3d3783610f55c..05b69657bfc219076c97d98aa210e3c322d03c2d 100755 (executable)
--- 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 88d0a4c0a6a46a4acb185f06b1fc8d70897af224..b8c54a7cce5d4ddb01631e48b93126115ea502c6 100755 (executable)
--- 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