From b2e0083e05100d060648e10b8f21a4df6aff3a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 28 Feb 2024 14:03:16 +0100 Subject: [PATCH 1/2] Add more test to get clearer error --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 0e4ec6e1..68b49623 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,9 @@ run: build-acceptance .PHONY: acceptance acceptance: run ## Run the acceptance tests cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) run pytest -vv --color=yes --junitxml=/tmp/junitxml/results.xml + cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis import *' + cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis.core import *' + cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis.server import *' cd acceptance_tests; docker-compose exec $(DOCKER_COMPOSE_TTY) qgis python3 -c 'from qgis._gui import *' .PHONY: run-client From 23dd2594bff2d9302103fec6134002386abb7742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 28 Feb 2024 14:04:14 +0100 Subject: [PATCH 2/2] Add python3-pyqt5.qtserialport, reorganize --- Dockerfile | 11 ++++++----- ci/dpkg-versions.yaml | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4cf05d24..e728debb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -148,15 +148,16 @@ RUN --mount=type=cache,target=/var/lib/apt/lists,id=apt-list \ --mount=type=cache,target=/var/cache,id=var-cache,sharing=locked \ apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends \ + python3 python3-pip \ + python3-pyqt5 python3-pyqt5.qtsql python3-pyqt5.qsci python3-pyqt5.qtpositioning \ + python3-pyqt5.qtmultimedia python3-pyqt5.qtserialport \ + xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb \ + spawn-fcgi xauth apache2 libapache2-mod-fcgid binutils glibc-tools pdal ocl-icd-libopencl1 \ libfcgi libgslcblas0 libqca-qt5-2 libqca-qt5-2-plugins libzip4 \ libqt5opengl5 libqt5sql5-sqlite libqt5concurrent5 libqt5positioning5 libqt5script5 \ libqt5webkit5 libqwt-qt5-6 libspatialindex6 libspatialite7 libsqlite3-0 libqt5keychain1 \ - python3 python3-pip ocl-icd-libopencl1 \ - python3-pyqt5 python3-pyqt5.qtsql python3-pyqt5.qsci python3-pyqt5.qtpositioning \ - spawn-fcgi xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb \ - apache2 libapache2-mod-fcgid python3 \ libqt5serialport5 libqt5quickwidgets5 libexiv2-27 libprotobuf23 libprotobuf-lite23 \ - libgsl27 libzstd1 libdraco4 binutils glibc-tools libqt5multimediawidgets5 python3-pyqt5.qtmultimedia pdal \ + libgsl27 libzstd1 libdraco4 libqt5multimediawidgets5 \ && strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 WORKDIR /tmp diff --git a/ci/dpkg-versions.yaml b/ci/dpkg-versions.yaml index 4dbabd83..6a194112 100644 --- a/ci/dpkg-versions.yaml +++ b/ci/dpkg-versions.yaml @@ -379,6 +379,7 @@ camptocamp/qgis-server:latest: ubuntu_22_04/python3-pyqt5.qsci: 2.11.6+dfsg-4 ubuntu_22_04/python3-pyqt5.qtmultimedia: 5.15.6+dfsg-1ubuntu3 ubuntu_22_04/python3-pyqt5.qtpositioning: 5.15.6+dfsg-1ubuntu3 + ubuntu_22_04/python3-pyqt5.qtserialport: 5.15.6+dfsg-1ubuntu3 ubuntu_22_04/python3-pyqt5.qtsql: 5.15.6+dfsg-1ubuntu3 ubuntu_22_04/python3-pyqt5.sip: 12.9.1-1build1 ubuntu_22_04/python3-setuptools: 59.6.0-1.2ubuntu0.22.04.1 @@ -799,6 +800,7 @@ camptocamp/qgis-server:latest-desktop: ubuntu_22_04/python3-pyqt5.qsci: 2.11.6+dfsg-4 ubuntu_22_04/python3-pyqt5.qtmultimedia: 5.15.6+dfsg-1ubuntu3 ubuntu_22_04/python3-pyqt5.qtpositioning: 5.15.6+dfsg-1ubuntu3 + ubuntu_22_04/python3-pyqt5.qtserialport: 5.15.6+dfsg-1ubuntu3 ubuntu_22_04/python3-pyqt5.qtsql: 5.15.6+dfsg-1ubuntu3 ubuntu_22_04/python3-pyqt5.sip: 12.9.1-1build1 ubuntu_22_04/python3-setuptools: 59.6.0-1.2ubuntu0.22.04.1