Merge branch 'qgis:master' into master

Author: JuhoErvasti

.ci/test_blocklist_qt6.txt

@@ -39,3 +39,304 @@ test_core_layerdefinition
 # MSSQL requires the MSSQL docker
 PyQgsProviderConnectionMssql
 PyQgsStyleStorageMssql
+
+# To be fixed
+PyQgsAFSProvider
+PyQgsAggregateMappingWidget
+PyQgsAnimatedMarkerSymbolLayer
+PyQgsArcGisRestUtils
+PyQgsPythonProvider
+PyQgsAggregateCalculator
+PyQgsAnnotation
+PyQgsAnnotationLayer
+PyQgsAnnotationLineItem
+PyQgsAnnotationLineTextItem
+PyQgsAnnotationMarkerItem
+PyQgsAnnotationPointTextItem
+PyQgsAnnotationPolygonItem
+PyQgsAttributeForm
+PyQgsAttributeTableModel
+PyQgsAuthenticationSystem
+PyQgsBatchGeocodeAlgorithm
+PyQgsBlendModes
+PyQgsBlockingProcess
+PyQgsBlockingNetworkRequest
+PyQgsBookmarkManager
+PyQgsBookmarkModel
+PyQgsCategorizedSymbolRenderer
+PyQgsCodeEditorPython
+PyQgsCodeEditor
+PyQgsColorRamp
+PyQgsColorRampLegendNode
+PyQgsColorUtils
+PyQgsCombinedStyleModel
+PyQgsCoordinateFormatter
+PyQgsConditionalStyle
+PyQgsConnectionRegistry
+PyQgsXmlUtils
+PyQgsDateTimeEdit
+PyQgsDateTimeStatisticalSummary
+PyQgsDelimitedTextProvider
+PyQgsEditWidgets
+PyQgsElevationProfileCanvas
+PyQgsEmbeddedSymbolRenderer
+PyQgsExifTools
+PyQgsExpression
+PyQgsExpressionBuilderWidget
+PyQgsFeature
+PyQgsFeatureSink
+PyQgsFieldComboBoxTest
+PyQgsFieldFormattersTest
+PyQgsProject
+PyQgsProjectBadLayers
+PyQgsProjectStyleSettings
+PyQgsFeatureIterator
+PyQgsFeatureRequest
+PyQgsFieldDomain
+PyQgsFieldDomainWidget
+PyQgsField
+PyQgsFields
+PyQgsFieldModel
+PyQgsFieldMappingWidget
+PyQgsFloatingWidget
+PyQgsGdalProvider
+PyQgsGeometryGeneratorSymbolLayer
+PyQgsGeometryTest
+PyQgsGpsLogger
+PyQgsGraduatedSymbolRenderer
+PyQgsGroupLayer
+PyQgsHashLineSymbolLayer
+PyQgsHighlight
+PyQgsJsonUtils
+PyQgsLabelObstacleSettings
+PyQgsLabelSettingsWidget
+PyQgsLabelThinningSettings
+PyQgsLayerMetadata
+PyQgsLayerMetadataProviderPython
+PyQgsLayerMetadataProviderOgr
+PyQgsLayerMetadataResultsModel
+PyQgsLayerTree
+PyQgsLayerTreeView
+PyQgsLayoutAtlas
+PyQgsLayoutElevationProfile
+PyQgsLayoutExporter
+PyQgsLayoutFrame
+PyQgsLayoutManagerModel
+PyQgsLayoutPageCollection
+PyQgsLayoutView
+PyQgsLayoutGuide
+PyQgsLayoutHtml
+PyQgsLayoutItem
+PyQgsLayoutItemComboBox
+PyQgsLayoutLabel
+PyQgsLayoutLegend
+PyQgsLayoutMap
+PyQgsLayoutItemMapItemClipPathSettings
+PyQgsLayoutMapGrid
+PyQgsLayoutMapOverview
+PyQgsLayoutMarker
+PyQgsLayoutPage
+PyQgsLayoutPicture
+PyQgsLayoutPolygon
+PyQgsLayoutPolyline
+PyQgsLayoutScaleBar
+PyQgsLayoutShape
+PyQgsLineSymbolLayers
+PyQgsLineburstSymbolLayer
+PyQgsLocator
+PyQgsMapBoxGlStyleConverter
+PyQgsMapLayer
+PyQgsMapLayerComboBox
+PyQgsMapLayerModel
+PyQgsMapLayerUtils
+PyQgsMapRenderer
+PyQgsMarkerLineSymbolLayer
+PyQgsMetadataBase
+PyQgsMemoryProvider
+PyQgsMeshLayerProfileGenerator
+PyQgsNetworkAccessManager
+PyQgsNullSymbolRenderer
+PyQgsNewGeoPackageLayerDialog
+PyQgsNewVectorTableDialog
+PyQgsOgcUtils
+PyQgsOGRProviderGpkg
+PyQgsOGRProviderSqlite
+PyQgsPalLabelingBase
+PyQgsPalLabelingCanvas
+PyQgsPalLabelingLayout
+PyQgsPalLabelingPlacement
+PyQgsPlot
+PyQgsPointCloudAttributeComboBox
+PyQgsPointCloudAttributeModel
+PyQgsPointCloudClassifiedRenderer
+PyQgsPointCloudLayerProfileGenerator
+PyQgsPointCloudRgbRenderer
+PyQgsPointDisplacementRenderer
+PyQgsProcessExecutablePt1
+PyQgsProcessExecutablePt2
+PyQgsProcessingInPlace
+PyQgsProcessingAlgRunner
+PyQgsProcessingParameters
+PyQgsProcessingPackageLayersAlgorithm
+PyQgsProjectMetadata
+PyQgsProjectUtils
+PyQgsProviderConnectionModel
+PyQgsProviderConnectionGpkg
+PyQgsProviderConnectionSpatialite
+PyQgsSensorManager
+PyQgsSensorModel
+PyQgsStyleStorageSpatialite
+PyQgsStyleStorageGpkg
+PyQgsProviderSublayerDetails
+PyQgsProviderSublayerModel
+PyQgsRangeSlider
+PyQgsRangeWidgets
+PyQgsRasterAttributeTable
+PyQgsRasterAttributeTableModel
+PyQgsRasterFileWriter
+PyQgsRasterLayer
+PyQgsRasterLayerProfileGenerator
+PyQgsRasterLayerRenderer
+PyQgsRasterLineSymbolLayer
+PyQgsRasterPipe
+PyQgsRasterTransparencyWidget
+PyQgsProviderUtils
+PyQgsRenderContext
+PyQgsRubberBand
+PyQgsSingleSymbolRenderer
+PyQgsShapefileProvider
+PyQgsSvgCache
+PyQgsTabfileProvider
+PyQgsTextRenderer
+PyQgsOGRProvider
+PyQgsShortcutsManager
+PyQgsSimpleLineSymbolLayer
+PyQgsSingleItemModel
+PyQgsSpatialiteProvider
+PyQgsSymbolLayer
+PyQgsRasterRendererCreateSld
+PyQgsSymbolLayerCreateSld
+PyQgsSymbolLayerReadSld
+PyQgsArrowSymbolLayer
+PyQgsSymbolExpressionVariables
+PyQgsStringUtils
+PyQgsStyleModel
+PyQgsSubsetStringEditorProviderRegistry
+PyQgsSymbolLayerUtils
+PyQgsTemporalUtils
+PyQgsTextDocument
+PyQgsTextFormatWidget
+PyQgsTreeWidgetItem
+PyQgsUnitTypes
+PyQgsValidityChecks
+PyQgsValidityResultsWidget
+PyQgsVectorFieldMarkerSymbolLayer
+PyQgsVectorFileWriter
+PyQgsVectorLayer
+PyQgsVectorLayerElevationProperties
+PyQgsVectorLayerFeatureCounter
+PyQgsVectorLayerCache
+PyQgsVectorLayerEditBuffer
+PyQgsVectorLayerEditUtils
+PyQgsVectorLayerProfileGenerator
+PyQgsVectorLayerSelectedFeatureSource
+PyQgsVectorLayerShapefile
+PyQgsVectorLayerTemporalProperties
+PyQgsVectorLayerUtils
+PyQgsZonalStatistics
+PyQgsVirtualLayerProvider
+PyQgsVirtualLayerDefinition
+PyQgsLayerDefinition
+PyQgsWFSProvider
+PyQgsOapifProvider
+PyQgsConsole
+PyQgsDBManagerGpkg
+PyQgsDBManagerSpatialite
+PyQgsFileDownloader
+PyQgsSettings
+PyQgsSettingsEntry
+PyQgsSettingsTreeNode
+PyQgsAuxiliaryStorage
+PyQgsFieldValidator
+PyQgsDBManagerSQLWindow
+PyQgsSelectiveMasking
+PyQgsRasterAttributeTableWidget
+PyQgsServerWMS
+PyQgsServerApi
+PyQgsServerWMSGetFeatureInfo
+PyQgsServerWMSGetMap
+PyQgsServerWMSGetLegendGraphic
+PyQgsServerWMSGetPrint
+PyQgsServerWMSGetPrintExtra
+PyQgsServerWMSGetPrintOutputs
+PyQgsServerWMSGetPrintAtlas
+PyQgsServerWMSDimension
+PyQgsServerSettings
+PyQgsServerAccessControlWMSGetlegendgraphic
+PyQgsServerAccessControlWFSTransactional
+PyQgsServerCacheManager
+PyQgsServerWFS
+PyQgsServerWFST
+PyQgsServerLocaleOverride
+PyQgsAuthManagerPasswordOWSTest
+PyQgsServerServices
+PyQgsArcGisPortalUtils
+PyQgsBinaryWidget
+PyQgsClassificationMethod
+PyQgsGeocoderLocatorFilter
+PyQgsNominatimGeocoder
+PyQgsGoogleMapsGeocoder
+PyQgsGpxProvider
+PyQgsHistoryProviderRegistry
+PyQgsLegendPatchShape
+PyQgsMapCanvas
+PyQgsMapCanvasAnnotationItem
+PyQgsMergedFeatureRenderer
+PyQgsMeshLayerElevationProperties
+PyQgsNumericFormat
+PyQgsPointCloudDataProvider
+PyQgsPointCloudExtentRenderer
+PyQgsPointClusterRenderer
+PyQgsTableCell
+PyQgsSearchWidgetWrapper
+PyQgsSimpleFillSymbolLayer
+PyQgsSymbol
+PyQgsTiles
+PyQgsRelationEditorWidgetRegistry
+PyQgsVectorTile
+PyQgsVtpk
+ProcessingGeneralTest
+ProcessingGuiTest
+ProcessingModelerTest
+ProcessingProjectProviderTest
+ProcessingParametersTest
+ProcessingGenericAlgorithmsTest
+ProcessingQgisAlgorithmsTestPt1
+ProcessingQgisAlgorithmsTestPt2
+ProcessingQgisAlgorithmsTestPt3
+ProcessingQgisAlgorithmsTestPt4
+ProcessingQgisAlgorithmsTestPt5
+ProcessingGdalAlgorithmsGeneralTest
+ProcessingGdalAlgorithmsRasterTest
+ProcessingGdalAlgorithmsVectorTest
+ProcessingCheckValidityAlgorithmTest
+ProcessingGrass7AlgorithmsImageryTest
+ProcessingGrass7AlgorithmsRasterTestPt1
+ProcessingGrass7AlgorithmsRasterTestPt2
+ProcessingGrass7AlgorithmsVectorTest
+ProcessingOtbAlgorithmsTest
+PyCoreAdditions
+PyPythonRepr
+TestQgsRandomMarkerSymbolLayer
+ProcessingToolsTest
+test_app_qgisapppython
+PyQgsCesium3dTilesLayer
+PyQgsCoordinateReferenceSystemModel
+PyQgsFilledLineSymbolLayer
+PyQgsPainting
+PyQgsProviderRegistry
+PyQgsTiledSceneLayer
+PyQgsTiledSceneTile
+ProcessingScriptUtilsTest
+PyQgsColorScheme
+PyQgsSearchWidgetToolButton

.docker/docker-qgis-build.sh

@@ -101,7 +101,7 @@ cmake \
  -DWITH_QWTPOLAR=OFF \
  -DWITH_APIDOC=OFF \
  -DWITH_ASTYLE=OFF \
- -DWITH_BINDINGS=${WITH_QT5} \
+ -DWITH_BINDINGS=ON \
  -DWITH_SERVER=ON \
  -DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_QT5} \
  -DWITH_ORACLE=ON \

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

@@ -151,7 +151,7 @@ RUN  apt-get update \
 
 # HANA: client side
 # Install hdbsql tool
-RUN curl -v -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_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 \
   && tar -xvf hanaclient-latest-linux-x64.tar.gz \
   && mkdir /usr/sap \
   && ./client/hdbinst -a client --sapmnt=/usr/sap \

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

@@ -1,6 +1,6 @@
 ARG DISTRO_VERSION=38
 
-FROM fedora:${DISTRO_VERSION} as single
+FROM fedora:${DISTRO_VERSION} as binary-for-oracle
 MAINTAINER Matthias Kuhn <[email protected]>
 
 RUN dnf -y --refresh install \
@@ -32,11 +32,17 @@ RUN dnf -y --refresh install \
     PDAL \
     PDAL-libs \
     PDAL-devel \
+    perl-YAML-Tiny \
     proj-devel \
     protobuf-devel \
     protobuf-lite-devel \
     python3-devel \
+    python3-pyqt6 \
+    python3-pyqt6-devel \
+    python3-qscintilla-qt6 \
+    python3-qscintilla-qt6-devel \
     python3-termcolor \
+    PyQt-builder \
     qca-qt6-devel \
     qt6-qt3d-devel \
     qt6-qtbase-devel \
@@ -53,6 +59,7 @@ RUN dnf -y --refresh install \
     qtkeychain-qt6-devel \
     qwt-qt6-devel \
     qscintilla-qt6-devel \
+    sip6 \
     spatialindex-devel \
     sqlite-devel \
     unzip \
@@ -83,3 +90,14 @@ RUN unzip instantclient-sqlplus-linux.x64-19.9.0.0.0dbru.zip
 
 ENV PATH="/instantclient_19_9:${PATH}"
 ENV LD_LIBRARY_PATH="/instantclient_19_9:${LD_LIBRARY_PATH}"
+ENV LANG=C.UTF-8
+
+FROM binary-for-oracle as binary-only
+
+RUN dnf -y --refresh install \
+    python3-gdal \
+    python3-nose2 \
+    python3-psycopg2 \
+    python3-pyyaml
+
+FROM binary-only

.github/workflows/build_artifact_comment.yml

@@ -77,10 +77,10 @@ jobs:
             });
             const PREFIX = "## 🪟 Windows builds ready!";
             let body = PREFIX + "\n\n" +
-                "Windows builds of this PR are available for testing [here](https://github.com/qgis/QGIS/suites/" +  context.payload.workflow_run.check_suite_id + "/artifacts/${{steps.download_artifact.outputs.artifact_id}}).";
+                "Windows builds of this PR are available for testing [here](https://github.com/" + context.repo.owner + "/" + context.repo.repo + "/suites/" +  context.payload.workflow_run.check_suite_id + "/artifacts/${{steps.download_artifact.outputs.artifact_id}}).";
             if ( ${{steps.download_artifact.outputs.debug_symbols_artifact_id}} > 0 )
             {
-              body += " Debug symbols for this build are available [here](https://github.com/qgis/QGIS/suites/" +  context.payload.workflow_run.check_suite_id + "/artifacts/${{steps.download_artifact.outputs.debug_symbols_artifact_id}}).";
+              body += " Debug symbols for this build are available [here](https://github.com/" + context.repo.owner + "/" + context.repo.repo + "/suites/" +  context.payload.workflow_run.check_suite_id + "/artifacts/${{steps.download_artifact.outputs.debug_symbols_artifact_id}}).";
             }
             body += "\n\n*(Built from commit " + git_sha + ")*";
 

.github/workflows/run-tests.yml

@@ -316,7 +316,7 @@ jobs:
 
           - qt-version: 6
             distro-version: 38
-            docker-target: single
+            docker-target: binary-only
 
           - qt-version: 5
             distro-version: 22.04