From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 5 Jul 2021 08:32:38 +0000 (+0200)
Subject: Merge pull request #2371 from lonvia/increase-python-version
X-Git-Tag: v4.0.0~57
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/4c52777ef03738803845f9ee58d269d93bbb9c3d?hp=-c

Merge pull request #2371 from lonvia/increase-python-version

Increase minimum required Python version to 3.6
---

4c52777ef03738803845f9ee58d269d93bbb9c3d
diff --combined .github/workflows/ci-tests.yml
index 99ce5cfa,7a3bfe35..8f0ea80d
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@@ -126,7 -126,7 +126,7 @@@ jobs
  
              - uses: actions/setup-python@v2
                with:
-                 python-version: 3.5
+                 python-version: 3.6
                if: matrix.ubuntu == 18
  
              - uses: ./Nominatim/.github/actions/setup-postgresql
@@@ -134,8 -134,13 +134,8 @@@
                    postgresql-version: ${{ matrix.postgresql }}
                    postgis-version: ${{ matrix.postgis }}
              - uses: ./Nominatim/.github/actions/build-nominatim
 -
 -            - name: Install extra dependencies for Ubuntu 18
 -              run: |
 -                sudo apt-get install libicu-dev
 -                pip3 install python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu osmium
 -              shell: bash
 -              if: matrix.ubuntu == 18
 +              with:
 +                  ubuntu: ${{ matrix.ubuntu }}
  
              - name: Clean installation
                run: rm -rf Nominatim build
diff --combined docs/admin/Installation.md
index a03b8304,adced3f2..cc1edf59
--- a/docs/admin/Installation.md
+++ b/docs/admin/Installation.md
@@@ -39,13 -39,12 +39,13 @@@ For running Nominatim
  
    * [PostgreSQL](https://www.postgresql.org) (9.3+ will work, 11+ strongly recommended)
    * [PostGIS](https://postgis.net) (2.2+)
-   * [Python 3](https://www.python.org/) (3.5+)
+   * [Python 3](https://www.python.org/) (3.6+)
    * [Psycopg2](https://www.psycopg.org) (2.7+)
    * [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/)
 +  * [datrie](https://github.com/pytries/datrie)
    * [PHP](https://php.net) (7.0 or later)
    * PHP-pgsql
    * PHP-intl (bundled with PHP)