From d9c3f9aa5197ed79081c3af71f66bc46a21af3b5 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Sat, 22 Feb 2025 07:07:31 +0100
Subject: [PATCH] qgisprocess: Update QGIS to v3.42.0
- Python package qgis is now installed under /usr/local
---
qgisprocess/.gitlab-ci.yml | 2 +-
qgisprocess/latest.Dockerfile | 9 ---------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/qgisprocess/.gitlab-ci.yml b/qgisprocess/.gitlab-ci.yml
index 643c95e..d73f904 100644
--- a/qgisprocess/.gitlab-ci.yml
+++ b/qgisprocess/.gitlab-ci.yml
@@ -1,7 +1,7 @@
.env:
variables:
R_VERSION: "4.4.2"
- QGIS_VERSION: "3.40.3"
+ QGIS_VERSION: "3.42.0"
OTB_VERSION: "9.1.0"
TAG_VERSION_MAJ_MIN: "false"
TAG_VERSION_MAJ: "false"
diff --git a/qgisprocess/latest.Dockerfile b/qgisprocess/latest.Dockerfile
index 9e661e0..8a8f1f4 100644
--- a/qgisprocess/latest.Dockerfile
+++ b/qgisprocess/latest.Dockerfile
@@ -209,15 +209,6 @@ RUN apt-get update \
&& apt-get -y install --no-install-recommends python3-pip \
&& export PIP_BREAK_SYSTEM_PACKAGES=1 \
&& /usr/bin/pip install qgis-plugin-manager \
- ## QGIS: Make sure qgis_mapserver and qgis_process find the qgis module
- && cp -a $(which qgis_mapserver) $(which qgis_mapserver)_ \
- && echo '#!/bin/bash' > $(which qgis_mapserver) \
- && echo "PYTHONPATH=/usr/lib/python3/dist-packages $(which qgis_mapserver)_ \"\${@}\"" >> \
- $(which qgis_mapserver) \
- && cp -a $(which qgis_process) $(which qgis_process)_ \
- && echo '#!/bin/bash' > $(which qgis_process) \
- && echo "PYTHONPATH=/usr/lib/python3/dist-packages $(which qgis_process)_ \"\${@}\"" >> \
- $(which qgis_process) \
## Install qgisprocess, the R interface to QGIS
&& install2.r --error --skipinstalled -n $NCPUS qgisprocess \
## Strip libraries of binary packages installed from P3M
--
GitLab