simplify weigh_search() function

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 0f4aea263a7acd510a98c9c53bad47eb14e4c306..42c03edc17d9e76fd20463b6294c25ce1fa730bc 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
         runs-on: ubuntu-latest
 
         steps:

-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4

               with:
                 submodules: true
 
               with:
                 submodules: true
 


@@ -72,8 +72,10 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}

-                  tools: phpunit, phpcs, composer
+                  tools: phpunit:9, phpcs, composer

                   ini-values: opcache.jit=disable
                   ini-values: opcache.jit=disable

+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

 
             - uses: actions/setup-python@v4
               with:
 
             - uses: actions/setup-python@v4
               with:


@@ -99,31 +101,37 @@ jobs:
               if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')
 
             - name: Install test prerequsites (from apt for Ununtu 2x)
               if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')
 
             - name: Install test prerequsites (from apt for Ununtu 2x)

-              run: sudo apt-get install -y -qq python3-pytest uvicorn
+              run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn

               if: matrix.flavour != 'oldstuff'
 
               if: matrix.flavour != 'oldstuff'
 

+            - name: Install newer pytest-asyncio
+              run: pip3 install -U pytest-asyncio==0.21.1
+              if: matrix.flavour == 'ubuntu-20'
+

             - name: Install test prerequsites (from pip for Ubuntu 18)
             - name: Install test prerequsites (from pip for Ubuntu 18)

-              run: pip3 install pytest uvicorn
+              run: pip3 install pytest pytest-asyncio uvicorn

               if: matrix.flavour == 'oldstuff'
 
             - name: Install Python webservers
               if: matrix.flavour == 'oldstuff'
 
             - name: Install Python webservers

-              run: pip3 install falcon sanic sanic-testing starlette
+              run: pip3 install falcon starlette asgi_lifespan

 
 

-            - name: Install latest pylint/mypy
-              run: pip3 install -U pylint mypy types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests typing-extensions asgi_lifespan sqlalchemy2-stubs
+            - name: Install latest pylint
+              run: pip3 install -U pylint
+              if: matrix.flavour != 'oldstuff'

 
             - name: PHP linting
               run: phpcs --report-width=120 .
               working-directory: Nominatim
 
             - name: PHP linting
               run: phpcs --report-width=120 .
               working-directory: Nominatim

+              if: matrix.flavour != 'oldstuff'

 
             - name: Python linting
               run: python3 -m pylint nominatim
               working-directory: Nominatim
 
             - name: Python linting
               run: python3 -m pylint nominatim
               working-directory: Nominatim

+              if: matrix.flavour != 'oldstuff'

 
             - name: PHP unit tests
               run: phpunit ./
               working-directory: Nominatim/test/php
 
             - name: PHP unit tests
               run: phpunit ./
               working-directory: Nominatim/test/php

-              if: ${{ (matrix.ubuntu == 20) || (matrix.ubuntu == 22) }}

 
             - name: Python unit tests
               run: python3 -m pytest test/python
 
             - name: Python unit tests
               run: python3 -m pytest test/python


@@ -134,8 +142,8 @@ jobs:
                   python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
               working-directory: Nominatim/test/bdd
 
                   python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
               working-directory: Nominatim/test/bdd
 

-            - name: Install newer Python packages (for typechecking info)
-              run: pip3 install -U osmium uvicorn
+            - name: Install mypy and typechecking info
+              run: pip3 install -U mypy osmium uvicorn types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests types-ujson types-Pygments typing-extensions

               if: matrix.flavour != 'oldstuff'
 
             - name: Python static typechecking
               if: matrix.flavour != 'oldstuff'
 
             - name: Python static typechecking


@@ -181,6 +189,39 @@ jobs:
               working-directory: Nominatim/test/bdd
 
 
               working-directory: Nominatim/test/bdd
 
 

+    python-api-test:
+        needs: create-archive
+        runs-on: ubuntu-22.04
+
+        steps:
+            - uses: actions/download-artifact@v3
+              with:
+                  name: full-source
+
+            - name: Unpack Nominatim
+              run: tar xf nominatim-src.tar.bz2
+
+            - uses: ./Nominatim/.github/actions/setup-postgresql
+              with:
+                  postgresql-version: 15
+                  postgis-version: 3
+
+            - uses: ./Nominatim/.github/actions/build-nominatim
+              with:
+                  flavour: 'ubuntu-22'
+
+            - name: Install test prerequsites
+              run: sudo apt-get install -y -qq python3-behave
+
+            - name: Install Python webservers
+              run: pip3 install starlette asgi_lifespan httpx
+
+            - name: BDD tests (starlette)
+              run: |
+                  python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=starlette --format=progress3
+              working-directory: Nominatim/test/bdd
+
+

     install:
         runs-on: ubuntu-latest
         needs: create-archive
     install:
         runs-on: ubuntu-latest
         needs: create-archive


@@ -245,6 +286,9 @@ jobs:
             - name: Prepare import environment
               run: |
                   mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf
             - name: Prepare import environment
               run: |
                   mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf

+                  mv Nominatim/settings/flex-base.lua flex-base.lua
+                  mv Nominatim/settings/import-extratags.lua import-extratags.lua
+                  mv Nominatim/settings/taginfo.lua taginfo.lua

                   rm -rf Nominatim
                   mkdir data-env-reverse
               working-directory: /home/nominatim
                   rm -rf Nominatim
                   mkdir data-env-reverse
               working-directory: /home/nominatim


@@ -253,6 +297,10 @@ jobs:
               run: nominatim --version
               working-directory: /home/nominatim/nominatim-project
 
               run: nominatim --version
               working-directory: /home/nominatim/nominatim-project
 

+            - name: Print taginfo
+              run: lua taginfo.lua
+              working-directory: /home/nominatim
+

             - name: Collect host OS information
               run: nominatim admin --collect-os-info
               working-directory: /home/nominatim/nominatim-project
             - name: Collect host OS information
               run: nominatim admin --collect-os-info
               working-directory: /home/nominatim/nominatim-project


@@ -301,3 +349,95 @@ jobs:
             - name: Clean up database (reverse-only import)
               run: nominatim refresh --postcodes --word-tokens
               working-directory: /home/nominatim/nominatim-project
             - name: Clean up database (reverse-only import)
               run: nominatim refresh --postcodes --word-tokens
               working-directory: /home/nominatim/nominatim-project

+
+    install-no-superuser:
+      runs-on: ubuntu-latest
+      needs: create-archive
+
+      strategy:
+          matrix:
+              name: [Ubuntu-22]
+              include:
+                  - name: Ubuntu-22
+                    image: "ubuntu:22.04"
+                    ubuntu: 22
+                    install_mode: install-apache
+
+      container:
+          image: ${{ matrix.image }}
+          env:
+              LANG: en_US.UTF-8
+
+      defaults:
+          run:
+              shell: sudo -Hu nominatim bash --noprofile --norc -eo pipefail {0}
+
+      steps:
+          - name: Prepare container (Ubuntu)
+            run: |
+                export APT_LISTCHANGES_FRONTEND=none
+                export DEBIAN_FRONTEND=noninteractive
+                apt-get update -qq
+                apt-get install -y git sudo wget
+                ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone
+            shell: bash
+
+          - name: Setup import user
+            run: |
+                useradd -m nominatim
+                echo 'nominatim   ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/nominiatim
+                echo "/home/nominatim/Nominatim/vagrant/Install-on-${OS}.sh no $INSTALL_MODE" > /home/nominatim/vagrant.sh
+            shell: bash
+            env:
+              OS: ${{ matrix.name }}
+              INSTALL_MODE: ${{ matrix.install_mode }}
+
+          - uses: actions/download-artifact@v3
+            with:
+                name: full-source
+                path: /home/nominatim
+
+          - name: Install Nominatim
+            run: |
+              export USERNAME=nominatim
+              export USERHOME=/home/nominatim
+              export NOSYSTEMD=yes
+              export HAVE_SELINUX=no
+              tar xf nominatim-src.tar.bz2
+              . vagrant.sh
+            working-directory: /home/nominatim
+
+          - name: Prepare import environment
+            run: |
+                mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf
+                mv Nominatim/settings/flex-base.lua flex-base.lua
+                mv Nominatim/settings/import-extratags.lua import-extratags.lua
+                mv Nominatim/settings/taginfo.lua taginfo.lua
+                rm -rf Nominatim
+                mkdir data-env-reverse
+            working-directory: /home/nominatim
+
+          - name: Prepare Database
+            run: |
+                nominatim import --prepare-database
+            working-directory: /home/nominatim/nominatim-project
+
+          - name: Create import user
+            run: |
+                sudo -u postgres createuser -S osm-import
+                sudo -u postgres psql -c "ALTER USER \"osm-import\" WITH PASSWORD 'osm-import';"
+            working-directory: /home/nominatim/nominatim-project
+
+          - name: Grant import user rights
+            run: |
+                sudo -u postgres psql -c "GRANT INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO \"osm-import\";"
+            working-directory: /home/nominatim/nominatim-project
+
+          - name: Run import
+            run: |
+                NOMINATIM_DATABASE_DSN="pgsql:host=127.0.0.1;dbname=nominatim;user=osm-import;password=osm-import" nominatim import --continue import-from-file --osm-file ../test.pbf
+            working-directory: /home/nominatim/nominatim-project
+
+          - name: Check full import
+            run: nominatim admin --check-database
+            working-directory: /home/nominatim/nominatim-project
\ No newline at end of file