Skip to content

Commit 5386265

Browse files
committed
Add sequential task queue for processing algorithms
1 parent 0642974 commit 5386265

File tree

7,704 files changed

+93246
-63852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,704 files changed

+93246
-63852
lines changed

.ci/ogc/Dockerfile

Lines changed: 85 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,94 @@
1-
FROM ubuntu:latest
1+
FROM ubuntu:25.10
22
RUN export DEBIAN_FRONTEND=noninteractive
33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update \
66
&& apt-get upgrade -y \
77
&& apt-get install -y \
8-
ccache \
9-
cmake \
10-
ninja-build \
11-
clang \
12-
flex \
13-
bison \
14-
libgeos-dev \
15-
libgdal-dev \
16-
libzip-dev \
17-
libprotobuf-dev \
18-
qtbase5-dev \
19-
libdraco-dev \
20-
libqt5svg5-dev \
21-
libqt5serialport5-dev \
22-
qttools5-dev \
23-
protobuf-compiler \
24-
qt5-qmake \
25-
qtbase5-dev-tools \
26-
qtchooser \
27-
qtpositioning5-dev \
28-
libqt5webkit5-dev \
29-
libqca-qt5-2-dev \
30-
libgsl-dev \
31-
libspatialindex-dev \
32-
qt5keychain-dev \
33-
libexiv2-dev \
34-
libfcgi-dev \
35-
libqt5scintilla2-dev \
36-
libqwt-qt5-dev \
37-
pyqt5-dev \
38-
python3-pyqt5 \
39-
python3-pyqt5.qsci \
40-
python3-all-dev \
41-
python3-dev \
42-
python3-sip-dev \
43-
pyqt5-dev-tools \
44-
spawn-fcgi
8+
bison \
9+
ccache \
10+
clang \
11+
cmake \
12+
ninja-build \
13+
flex \
14+
locales \
15+
mold \
16+
libdraco-dev \
17+
libexiv2-dev \
18+
libexpat1-dev \
19+
libfcgi-dev \
20+
libgeographiclib-dev \
21+
libgeos-dev \
22+
libgdal-dev \
23+
libgsl-dev \
24+
libpq-dev \
25+
libprotobuf-dev \
26+
libqca-qt6-dev \
27+
libqt6opengl6-dev \
28+
libqscintilla2-qt6-dev \
29+
libqt6svg6-dev \
30+
libspatialite-dev \
31+
libsqlite3-dev \
32+
libsqlite3-mod-spatialite \
33+
libzip-dev \
34+
libzstd-dev \
35+
protobuf-compiler \
36+
pyqt6-dev-tools \
37+
pyqt6.qsci-dev \
38+
python3-all-dev \
39+
python3-dev \
40+
python3-gdal \
41+
python3-mock \
42+
python3-nose2 \
43+
python3-numpy \
44+
python3-oauthlib \
45+
python3-openssl \
46+
python3-owslib \
47+
python3-pep8 \
48+
python3-pexpect \
49+
python3-pip \
50+
python3-psycopg2 \
51+
python3-pyproj \
52+
python3-pyqt6 \
53+
python3-pyqt6.qsci \
54+
python3-pyqt6.qtsvg \
55+
python3-pyqt6.qtpositioning \
56+
python3-pyqt6.qtmultimedia \
57+
python3-pyqt6.qtserialport \
58+
python3-pyqt6.qtwebengine \
59+
python3-pyqt6.sip \
60+
python3-pyqtbuild \
61+
python3-requests \
62+
python3-shapely \
63+
python3-geopandas \
64+
python3-sphinx \
65+
python3-sipbuild \
66+
python3-six \
67+
python3-termcolor \
68+
python3-yaml \
69+
libsfcgal-dev \
70+
sip-tools \
71+
qmake6 \
72+
qt6-3d-dev \
73+
qtkeychain-qt6-dev \
74+
qt6-base-dev \
75+
qt6-declarative-dev-tools \
76+
qt6-positioning-dev \
77+
qt6-multimedia-dev \
78+
qt6-tools-dev \
79+
qt6-tools-dev-tools \
80+
qt6-base-private-dev \
81+
qt6-5compat-dev \
82+
qt6-webengine-dev \
83+
qt6-pdf-dev \
84+
qt6-serialport-dev \
85+
opencl-headers \
86+
ocl-icd-opencl-dev \
87+
spawn-fcgi
88+
89+
RUN echo "C UTF-8" > /etc/locale.gen
90+
RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
91+
RUN locale-gen
4592

4693
ADD qgis_mapserv.sh /root/qgis_mapserv.sh
4794
CMD ["sh", "/root/qgis_mapserv.sh"]

.ci/ogc/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -e
55
mkdir -p /usr/src/qgis/build
66
cd /usr/src/qgis/build || exit 1
77

8+
export LANG="C.UTF-8"
9+
810
export CCACHE_TEMPDIR=/tmp
911
# Github workflow cache max size is 2.0, but ccache data get compressed (roughly 1/5?)
1012
ccache -M 2.0G
@@ -16,12 +18,13 @@ ccache -z
1618
# To make ccache work properly with precompiled headers
1719
ccache --set-config sloppiness=pch_defines,time_macros,include_file_mtime,include_file_ctime
1820

21+
# -DWITH_INTERNAL_SPATIALINDEX=ON because of broken libspatialindex 2.1 on Ubuntu 25.10
1922
cmake -GNinja \
2023
-DUSE_CCACHE=ON \
2124
-DWITH_QUICK=OFF \
2225
-DWITH_3D=OFF \
2326
-DWITH_STAGED_PLUGINS=OFF \
24-
-DBUILD_WITH_QT6=OFF \
27+
-DBUILD_WITH_QT6=ON \
2528
-DWITH_GRASS=OFF \
2629
-DENABLE_MODELTEST=OFF \
2730
-DENABLE_PGTEST=OFF \
@@ -34,9 +37,11 @@ cmake -GNinja \
3437
-DWITH_GSL=OFF \
3538
-DWITH_DESKTOP=OFF \
3639
-DWITH_GUI=OFF \
40+
-DWITH_GEOGRAPHICLIB=ON \
3741
-DWITH_BINDINGS=ON \
3842
-DWITH_SERVER=ON \
3943
-DWITH_SERVER_PLUGINS=ON \
44+
-DWITH_INTERNAL_SPATIALINDEX=ON \
4045
-DWITH_ORACLE=OFF \
4146
-DWITH_PDAL=OFF \
4247
-DWITH_QTPRINTER=OFF \

.ci/test_blocklist_qt5.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
test_gui_queryresultwidget
33

44
# code layout tests are run on separate build
5-
qgis_spelling
65
qgis_sipify
76
qgis_sip_include
87
qgis_sip_uptodate

.ci/test_blocklist_qt6_fedora.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
test_gui_queryresultwidget
33

44
# code layout tests are run on separate build
5-
qgis_spelling
65
qgis_sipify
76
qgis_sip_include
87
qgis_sip_uptodate

.ci/test_blocklist_qt6_ubuntu.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
test_gui_queryresultwidget
33

44
# code layout tests are run on separate build
5-
qgis_spelling
65
qgis_sipify
76
qgis_sip_include
87
qgis_sip_uptodate

.docker/docker-qgis-build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ cmake \
102102
-DWITH_APIDOC=OFF \
103103
-DWITH_ASTYLE=OFF \
104104
-DWITH_BINDINGS=ON \
105+
-DWITH_GEOGRAPHICLIB=ON \
105106
-DWITH_SERVER=ON \
106107
-DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_SERVER_LANDINGPAGE_WEBAPP} \
107108
-DWITH_ORACLE=ON \

.docker/qgis3-fedora-qt6-build-deps.dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ RUN dnf -y --refresh install \
2020
gdal \
2121
gdal-devel \
2222
gdal-python-tools \
23+
GeographicLib-devel \
2324
geos-devel \
2425
gpsbabel \
2526
grass \
@@ -95,6 +96,9 @@ RUN dnf -y --refresh install \
9596
blend2d-devel
9697

9798

99+
# download wmm2025 magnetic field model for testing
100+
RUN geographiclib-get-magnetic wmm2025
101+
98102
# Oracle : client side
99103
RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-basic-linux.x64-21.16.0.0.0dbru.zip > instantclient-basic-linux.x64-21.16.0.0.0dbru.zip
100104
RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip > instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip
@@ -117,6 +121,7 @@ RUN dnf -y install \
117121
python3-psycopg2 \
118122
python3-pyyaml \
119123
python3-shapely \
120-
python3-geopandas
124+
python3-geopandas \
125+
python3-pyarrow
121126

122127
FROM binary-only

.docker/qgis3-ubuntu-qt6-build-deps.dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN apt-get update \
3131
'libdraco4|libdraco8' \
3232
libexiv2-28 \
3333
'libfcgi0ldbl|libfcgi0t64' \
34+
libgeographiclib26 \
3435
libgsl28 \
3536
'libprotobuf-lite17|libprotobuf-lite23|libprotobuf-lite32t64' \
3637
libqca-qt6-plugins \
@@ -107,7 +108,8 @@ RUN apt-get update \
107108
RUN pip3 install --break-system-packages \
108109
future \
109110
capturer \
110-
hdbcli
111+
hdbcli \
112+
pyarrow
111113
RUN apt-get clean
112114

113115
# Node.js and Yarn for server landingpage webapp
@@ -145,7 +147,7 @@ RUN apt-get update \
145147
libgdal-dev \
146148
libproj-dev
147149

148-
RUN
150+
RUN
149151
FROM binary-for-oracle AS binary-only
150152

151153
RUN apt-get update \
@@ -191,6 +193,7 @@ RUN apt-get update \
191193
libexiv2-dev \
192194
libexpat1-dev \
193195
libfcgi-dev \
196+
libgeographiclib-dev \
194197
libgeos-dev \
195198
libgsl-dev \
196199
libpq-dev \

.github/workflows/build-macos-qt6.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232

3333
steps:
3434
- name: 🐣 Checkout
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636

3737
- name: 🐩 Install CMake and Ninja
38-
uses: lukka/get-cmake@628dd514bed37cb0a609e84a6186cbbaa2fc0140 # latest
38+
uses: lukka/get-cmake@bb2faa721a800324b726fec00f7c1ff7641964d1 # latest
3939
with:
4040
# Pin to specific version to avoid rebuilding too often
4141
# Also helps to avoid spurious build failures like https://github.com/qgis/QGIS/pull/47098
@@ -94,6 +94,7 @@ jobs:
9494
-D WITH_QTWEBENGINE=OFF \
9595
-D WITH_BINDINGS=ON \
9696
-D WITH_ORACLE=ON \
97+
-D WITH_GEOGRAPHICLIB=OFF \
9798
-D WITH_SFCGAL=ON \
9899
-D VCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
99100
-D VCPKG_HOST_TRIPLET="${{ matrix.triplet }}" \
@@ -154,7 +155,7 @@ jobs:
154155
needs: build
155156
steps:
156157
- name: 🐣 Checkout
157-
uses: actions/checkout@v5
158+
uses: actions/checkout@v6
158159

159160
- name: 🔨 Prepare build env
160161
run: |

.github/workflows/check-user-reported-qgis-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v6
1616

1717
- name: Get version details
1818
run: |

0 commit comments

Comments
 (0)