From: Michal Nowak <mnowak@isc.org>
Date: Thu, 10 Oct 2024 17:46:22 +0000 (+0200)
Subject: Use Debian "sid" for pylint and mypy jobs to get recent dnspython
X-Git-Tag: v9.20.6~26^2~4
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3047cc9a25c37c9467ddc35603964111d398add1;p=thirdparty%2Fbind9.git

Use Debian "sid" for pylint and mypy jobs to get recent dnspython

The base image tends to have a rather old dnspython version and when
used with pylint and mypy it produces errors about newer dnspython
features the old version does not know about.

    $ mypy "bin/tests/system/isctest/"
    bin/tests/system/isctest/query.py:55: error: Unexpected keyword argument "verify" for "tls"  [call-arg]
    /usr/lib/python3/dist-packages/dns/query.py:958: note: "tls" defined here

    $ pylint --rcfile $CI_PROJECT_DIR/.pylintrc --disable=wrong-import-position $(git ls-files 'bin/tests/system/*.py' | grep -vE 'ans\.py')
    ************* Module isctest.query
    bin/tests/system/isctest/query.py:55:11: E1123: Unexpected keyword argument 'verify' in function call (unexpected-keyword-arg)

(cherry picked from commit b2964cc922f9630d4800d1409ed5b7e253ca3324)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 425d24a2eb7..d0722c79216 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -578,7 +578,9 @@ coccinelle:
     - if test "$(git status --porcelain | grep -Ev '\?\?' | wc -l)" -gt "0"; then git status --short; exit 1; fi
 
 pylint:
-  <<: *precheck_job
+  <<: *default_triggering_rules
+  <<: *debian_sid_amd64_image
+  stage: precheck
   needs: []
   variables:
     PYTHONPATH: "${CI_PROJECT_DIR}/bin/tests/system"
@@ -631,7 +633,9 @@ checkbashisms:
     - checkbashisms $(find . -path './.git' -prune -o -type f -exec sh -c 'head -n 1 "{}" | grep -qsF "#!/bin/sh"' \; -print)
 
 mypy:
-  <<: *precheck_job
+  <<: *default_triggering_rules
+  <<: *debian_sid_amd64_image
+  stage: precheck
   script:
     - mypy "bin/tests/system/isctest/"