CIL use psutil type stubs

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index 38deeb968d385d20d3aac510fa319d89db38a55b..c6ff7a31ca599caff9e35b51081e88ebc0c1fd28 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -27,7 +27,6 @@ runs:
             else
                 sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv python3-yaml
             fi
             else
                 sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv python3-yaml
             fi

-            sudo pip3 install -U typing-extensions

           shell: bash
           env:
             UBUNTUVER: ${{ inputs.ubuntu }}
           shell: bash
           env:
             UBUNTUVER: ${{ inputs.ubuntu }}

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 5d70b56838eceb23b51abb5ef3c8207ffa3d070b..481ec767cd088d12d3d228c50f129f23771f5359 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -98,8 +98,8 @@ jobs:
               run: sudo apt-get install -y -qq python3-pytest
               if: matrix.ubuntu == 22
 
               run: sudo apt-get install -y -qq python3-pytest
               if: matrix.ubuntu == 22
 

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

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

diff --git a/.mypy.ini b/.mypy.ini
index c019a55ed21f21683a001a0ea7095eeba4f8da7a..81a5c2e793cf2a7160f15155dcc29952e4184747 100644 (file)
--- a/.mypy.ini
+++ b/.mypy.ini
@@ -3,9 +3,6 @@
 [mypy-icu.*]
 ignore_missing_imports = True
 
 [mypy-icu.*]
 ignore_missing_imports = True
 

-[mypy-psutil]
-ignore_missing_imports = True
-

 [mypy-osmium.*]
 ignore_missing_imports = True
 
 [mypy-osmium.*]
 ignore_missing_imports = True