Merge remote-tracking branch 'upstream/master'

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 8dd19aa4621c057cd11c726531dd4ab007f3607e..9bdf1790dcccc7e91969a7c4f7797172b4822309 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -35,8 +35,8 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
-                     {{ github.workspace }}/data/country_osm_grid.sql.gz
-                     {{ github.workspace }}/monaco-latest.osm.pbf
+                     data/country_osm_grid.sql.gz
+                     monaco-latest.osm.pbf
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql
@@ -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 php-symfony-dotenv
-                   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 --extension-pkg-whitelist=osmium 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
@@ -78,8 +82,8 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
-                     {{ github.workspace }}/data/country_osm_grid.sql.gz
-                     {{ github.workspace }}/monaco-latest.osm.pbf
+                     data/country_osm_grid.sql.gz
+                     monaco-latest.osm.pbf
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql
@@ -88,11 +92,6 @@ jobs:
                   postgis-version: 3
             - uses: ./.github/actions/build-nominatim
 
-            - name: Create configuration
-              run: |
-                   echo "NOMINATIM_PYOSMIUM_BINARY=/usr/lib/python3-pyosmium/pyosmium-get-changes" >> .env
-              working-directory: build
-
             - name: Download import data
               run: |
                   if [ ! -f monaco-latest.osm.pbf ]; then