pytest may also be installed as py-test[-3]

[nominatim.git] / .github / workflows / ci-tests.yml

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 4b019bce04a3152cd4ae8300d01a8fc9736cda93..8b20b55d7820a42318d111b9b7d26cba0e0660cc 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -46,17 +46,21 @@ jobs:
             - uses: ./.github/actions/build-nominatim
 
             - name: Install test prerequsites
-              run: |
-                   sudo apt-get install -y -qq php-codesniffer python3-tidylib
-                   sudo pip3 install behave
+              run: sudo apt-get install -y -qq php-codesniffer pylint python3-pytest python3-behave
 
             - name: PHP linting
               run: phpcs --report-width=120 .
 
+            - name: Python linting
+              run: pylint nominatim
+
             - name: PHP unit tests
               run: phpunit ./
               working-directory: test/php
 
+            - name: Python unit tests
+              run: py.test-3 test/python
+
             - name: BDD tests
               run: behave -DREMOVE_TEMPLATE=1 --format=progress3
               working-directory: test/bdd
@@ -101,25 +105,25 @@ jobs:
               shell: bash
 
             - name: Import
-              run: php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --osm2pgsql-cache 500 --all
+              run: ./nominatim import --osm-file ../monaco-latest.osm.pbf
               working-directory: build
 
             - name: Import special phrases
-              run: php ./utils/specialphrases.php --wiki-import | psql -d nominatim
+              run: ./nominatim special-phrases --from-wiki | psql -d nominatim
               working-directory: build
 
             - name: Check import
-              run: php ./utils/check_import_finished.php
+              run: ./nominatim check-database
               working-directory: build
 
             - name: Run update
               run: |
-                   php ./utils/update.php --init-updates
-                   php ./utils/update.php --import-osmosis
+                   ./nominatim replication --init
+                   ./nominatim replication --once
               working-directory: build
 
             - name: Run reverse-only import
               run : |
                   dropdb nominatim
-                  php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --reverse-only --all
+                  php ./nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only
               working-directory: build