Merge pull request #2974 from bloom256/main-tag-in-reverse-lookup

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index e7ba35f676f36157d266787c0e0a58d540435345..3fe0b9d81d326925b64024f3567e0e0676e5c241 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -72,7 +72,7 @@ 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
 
             - uses: actions/setup-python@v4
                   ini-values: opcache.jit=disable
 
             - uses: actions/setup-python@v4


@@ -99,18 +99,22 @@ 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
+              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
               run: pip3 install falcon sanic sanic-testing sanic-cors starlette
 
               if: matrix.flavour == 'oldstuff'
 
             - name: Install Python webservers
               run: pip3 install falcon sanic sanic-testing sanic-cors starlette
 

-            - name: Install latest pylint/mypy
-              run: pip3 install -U pylint mypy types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests types-ujson typing-extensions asgi_lifespan sqlalchemy2-stubs
+            - name: Install latest pylint
+              run: pip3 install -U pylint asgi_lifespan

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


@@ -123,7 +127,6 @@ jobs:
             - 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 +137,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 typing-extensions

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