auth methods + QCA

.ci/ctest2ci.py

@@ -111,7 +111,7 @@ def start_test_fold():
 
     if not in_failing_test and re.search('[0-9]+% tests passed, [0-9]+ tests failed out of', updated_line):
         tests_failing = re.match(r'.* ([0-9]+) tests failed', updated_line).group(1)
-        updated_line += '\n::set-output name=TESTS_FAILING::{}'.format(tests_failing)
+        # updated_line += '\n::set-output name=TESTS_FAILING::{}'.format(tests_failing)
         end_fold()
 
         if re.search('100% tests passed', updated_line):
@@ -121,7 +121,7 @@ def start_test_fold():
         start_fold('submit')
     elif re.search('Test results submitted to', updated_line):
         cdash_url = re.match(r'.*(http.*)$', updated_line).group(1)
-        updated_line += '\n::set-output name=CDASH_URL::{}'.format(cdash_url)
+        # updated_line += '\n::set-output name=CDASH_URL::{}'.format(cdash_url)
         end_fold()
 
     sys.stdout.write(updated_line)

.ci/run_tests.sh

@@ -2,17 +2,20 @@
 
 set -e
 
-# check for docker-compose and docker availability
-command -v docker > /dev/null || {
-	echo "Please install docker" >&2
+DOCKER=$(command -v podman docker | head -1)
+
+# check for docker availability
+test -n "${DOCKER}" || {
+	echo "Please install podman or docker" >&2
 	exit 1
 }
-command -v docker-compose > /dev/null || {
-	echo "Please install docker-compose" >&2
-	exit 1
+
+DOCKER_COMPOSE=$(command -v podman-compose docker-compose | head -1)
+test -n "${DOCKER_COMPOSE}" || {
+  DOCKER_COMPOSE="${DOCKER} compose" # TODO: check if supported
 }
 
-IMAGE_BUILD_DEPS=qgis/qgis3-build-deps:latest
+IMAGE_BUILD_DEPS=docker.io/qgis/qgis3-build-deps:latest
 UPDATE_IMAGES=yes
 INTERACTIVE=no
 FORCE_REBUILD=no
@@ -74,22 +77,25 @@ echo "--=[ QGIS_COMMON_GIT_DIR is $QGIS_COMMON_GIT_DIR"
 # Make qgis3-build-deps-binary-image available, building it if needed
 #
 
-if test "$(docker images -q ${IMAGE_BUILD_DEPS})" = ""; then
+if test "$(${DOCKER} images -q ${IMAGE_BUILD_DEPS})" = ""; then
   echo "--=[ Fetching qgis build dependencies image"
-  docker pull ${IMAGE_BUILD_DEPS}
+  ${DOCKER} pull ${IMAGE_BUILD_DEPS}
 elif test "${UPDATE_IMAGES}" = "yes"; then
   echo "--=[ Updating qgis build dependencies image"
-  docker pull ${IMAGE_BUILD_DEPS}
+  ${DOCKER} pull ${IMAGE_BUILD_DEPS}
 fi
 
 if test -d ${QGIS_BUILDDIR} -a "${FORCE_REBUILD}" = "no"; then
   echo "--=[ Testing against pre-existing build directory ${QGIS_BUILDDIR}. To rebuild use --force-rebuild or move it away"
 else
   echo "--=[ Building qgis inside the dependencies container"
-  docker run -t --name qgis_container \
+  VOLUMES="-v ${QGIS_WORKSPACE}:${QGIS_WORKSPACE}:z"
+  if test "${QGIS_WORKSPACE}" != "${QGIS_COMMON_GIT_DIR}"; then
+    VOLUMES="${VOLUMES} -v ${QGIS_COMMON_GIT_DIR}:${QGIS_COMMON_GIT_DIR}:z"
+  fi
+  ${DOCKER} run -t --name qgis_container \
     --rm \
-    -v ${QGIS_WORKSPACE}:${QGIS_WORKSPACE} \
-    -v ${QGIS_COMMON_GIT_DIR}:${QGIS_COMMON_GIT_DIR} \
+    ${VOLUMES} \
     --env-file .docker/docker-variables.env \
     --env PUSH_TO_CDASH=false \
     --env WITH_QT5=true \
@@ -109,13 +115,13 @@ else
   }
 fi
 
-if test "$(docker images -q qgis3-build-deps-binary-image)" = ""; then
+if test "$(${DOCKER} images -q qgis3-build-deps-binary-image)" = ""; then
   echo "--=[ Tagging qgis build dependencies image as required by .docker/docker-compose-testing.yml"
-  docker tag ${IMAGE_BUILD_DEPS} qgis3-build-deps-binary-image
+  ${DOCKER} tag ${IMAGE_BUILD_DEPS} qgis3-build-deps-binary-image
 fi
 
 if test "${INTERACTIVE}" = "no"; then
-  echo "--=[ Running tests via docker-compose"
+  echo "--=[ Running tests via docker compose"
   COMMAND=${QGIS_WORKSPACE_MOUNTPOINT}/.docker/docker-qgis-test.sh
   COMMAND_ARGS="${TESTS_TO_RUN}"
 else
@@ -129,7 +135,7 @@ mkdir -p /tmp/minio_tests/test-bucket && chmod -R 777 /tmp/minio_tests
 # Create an empty webdav folder with appropriate permissions so www user can write inside it
 mkdir -p /tmp/webdav_tests && chmod 777 /tmp/webdav_tests
 
-docker-compose \
+${DOCKER_COMPOSE} \
   -f .docker/docker-compose-testing.yml \
   run \
   -w "${QGIS_WORKSPACE_MOUNTPOINT}" \

.docker/qgis3-qt5-build-deps.dockerfile

@@ -152,7 +152,7 @@ RUN  apt-get update \
 
 # HANA: client side
 # Install hdbsql tool
-RUN curl -j -k -L -H "Cookie: eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt" https://tools.hana.ondemand.com/additional/hanaclient-latest-linux-x64.tar.gz --output hanaclient-latest-linux-x64.tar.gz \
+RUN curl -j -k -L -H "Cookie: eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt" https://tools.hana.ondemand.com/additional/hanaclient-latest-linux-x64.tar.gz --output hanaclient-latest-linux-x64.tar.gz \
   && tar -xvf hanaclient-latest-linux-x64.tar.gz \
   && mkdir /usr/sap \
   && ./client/hdbinst -a client --sapmnt=/usr/sap \

.github/workflows/build_artifact_comment.yml

@@ -5,9 +5,6 @@ on:
     workflows: [🪟 MingW64 Windows 64bit Build]
     types:
       - completed
-    branches-ignore:
-      - 'master'
-      - 'release*'
 
 permissions:
   contents: read

.github/workflows/code_layout.yml → .github/workflows/code_layout.yml.disabled

@@ -154,25 +154,24 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+
       - name: Install Requirements
         run: |
           sudo apt install -y \
               expect \
               silversearcher-ag
-      - uses: tj-actions/changed-files@v42
+
+      - name: Retrieve changed files
+        uses: tj-actions/changed-files@v44
         id: changed_files
         with:
-          separator: ' '
-          files_ignore: |
-            **/*.sip.in
-            **/*.png
-            **/*.svg
-            **/*.tif*
-            **/*.gpkg
-            **/*.qgz
-            **/*.qgs
+          separator: " "
+
       - name: Spell Test
-        run: ./scripts/spell_check/check_spelling.sh -r "${{ steps.changed_files.outputs.all_changed_files }}"
+        if: steps.changed_files.outputs.any_changed == 'true'
+        env:
+          ALL_CHANGED_FILES: ${{ steps.changed_files.outputs.all_changed_files }}
+        run: echo "$ALL_CHANGED_FILES" | ./scripts/spell_check/check_spelling.sh
 
   sip_check:
     runs-on: ubuntu-latest

.github/workflows/flake8.yml → .github/workflows/flake8.yml.disabled

@@ -6,6 +6,9 @@ concurrency:
 
 on:
   push:
+    branches:
+      - master
+      - release-*
     paths:
       - '**.py'
   pull_request:

.github/workflows/macos-build.yml → .github/workflows/macos-build.yml.disabled

@@ -34,7 +34,7 @@ env:
 jobs:
   mac_os_build:
     if: github.repository == 'qgis/QGIS'
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/mingw-w64-msys2.yml → .github/workflows/mingw-w64-msys2.yml.disabled

@@ -52,6 +52,7 @@ jobs:
             protobuf:p proj:p qca-qt5:p qscintilla-qt5:p qt5-3d:p qt5-base:p qt5-declarative:p
             qt5-gamepad:p qt5-location:p qt5-serialport:p qt5-svg:p qtkeychain-qt5:p qtwebkit:p
             qwt-qt5:p spatialindex:p cc:p cmake:p ninja:p opencl-clhpp:p qt5-tools:p python:p ccache:p
+            python-gdal:p python-owslib:p python-pyqt5:p python-qscintilla-qt5:p pyqt-builder:p sip:p
           update: true
           release: false
 
@@ -65,17 +66,15 @@ jobs:
 
       - name: Configure QGIS
         run: |
-          CXXFLAGS="-DQWT_POLAR_VERSION=0x060200" \
           cmake \
             -G"Ninja" \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python \
             -DWITH_3D=ON \
             -DWITH_DRACO=ON \
-            -DWITH_PDAL=OFF \
+            -DWITH_PDAL=ON \
             -DWITH_CUSTOM_WIDGETS=ON \
-            -DWITH_QWTPOLAR=OFF \
-            -DWITH_BINDINGS=OFF \
+            -DWITH_BINDINGS=ON \
             -DWITH_GRASS=OFF \
             -DUSE_CCACHE=ON \
             -S . \