BUILD TEST Gpu limit

.github/workflows/write_failure_comment.yml

@@ -49,7 +49,7 @@ jobs:
 
       - name: 'Unzip artifact'
         if: fromJSON(steps.download_artifact.outputs.artifact_id) > 0
-        run: unzip -j test-results-qt${{ matrix.qt-version }}.zip summary.md pr_number git_commit
+        run: unzip -j test-results-qt${{ matrix.qt-version }}.zip *.md pr_number git_commit || ( e=$? && if [ $e -ne 11 ]; then exit $e; fi )
 
       - name: 'Post test report markdown summary as comment on PR'
         if: fromJSON(steps.download_artifact.outputs.artifact_id) > 0

python/3d/auto_generated/qgs3dmapscene.sip.in

@@ -13,7 +13,6 @@
 
 
 
-
 class Qgs3DMapScene : QObject
 {
 %Docstring(signature="appended")
@@ -31,7 +30,7 @@ Entity that encapsulates our 3D scene - contains all other entities (such as ter
 %End
   public:
 
-    QgsCameraController *cameraController();
+    QgsCameraController *cameraController() const;
 %Docstring
 Returns camera controller
 %End
@@ -49,16 +48,11 @@ Resets camera view to show the extent ``extent`` (top view)
 .. versionadded:: 3.26
 %End
 
-    QVector<QgsPointXY> viewFrustum2DExtent();
+    QVector<QgsPointXY> viewFrustum2DExtent() const;
 %Docstring
 Calculates the 2D extent viewed by the 3D camera as the vertices of the viewed trapezoid
 
 .. versionadded:: 3.26
-%End
-
-    int terrainPendingJobsCount() const;
-%Docstring
-Returns number of pending jobs of the terrain entity
 %End
 
     int totalPendingJobsCount() const;
@@ -70,6 +64,7 @@ Returns number of pending jobs for all chunked entities
 
     enum SceneState
     {
+      Canceled,
       Ready,
       Updating,
     };
@@ -79,7 +74,7 @@ Returns number of pending jobs for all chunked entities
 Returns the current state of the scene
 %End
 
-    float worldSpaceError( float epsilon, float distance );
+    float worldSpaceError( float epsilon, float distance ) const;
 %Docstring
 Given screen error (in pixels) and distance from camera (in 3D world coordinates), this function
 estimates the error in world space. Takes into account camera's field of view and the screen (3D view) size.
@@ -93,7 +88,7 @@ Exports the scene according to the scene export settings
 
 
 
-    QgsRectangle sceneExtent();
+    QgsRectangle sceneExtent() const;
 %Docstring
 Returns the scene extent in the map's CRS
 
@@ -118,6 +113,23 @@ Returns the scene's elevation range
 Returns the 3D map settings.
 
 .. versionadded:: 3.30
+%End
+
+    double usedGpuMemory() const;
+%Docstring
+Returns the used gpu memory for this 3D scene
+%End
+    double maxAvailableGpuMemory() const;
+%Docstring
+Returns the max available gpu memory for this 3D scene
+%End
+    QList<QString> frozenLayers() const;
+%Docstring
+Returns frozen layer name list
+%End
+    void readAvailableGpuMemory();
+%Docstring
+Reads available gpu memory from settings or gpu card
 %End
 
     static QMap< QString, Qgs3DMapScene * > openScenes();
@@ -136,10 +148,6 @@ Returns a map of 3D map scenes (by name) open in the QGIS application.
     void terrainEntityChanged();
 %Docstring
 Emitted when the current terrain entity is replaced by a new one
-%End
-    void terrainPendingJobsCountChanged();
-%Docstring
-Emitted when the number of terrain's pending jobs changes
 %End
 
     void totalPendingJobsCountChanged();

python/CMakeLists.txt

@@ -174,7 +174,8 @@ GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip "${sip_files_core}" cpp
 BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} "" qgis_core)
 set(SIP_CORE_CPP_FILES ${cpp_files})
 
-if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
+# TODO QGIS 4 : remove this hack when we switch completely to Qt 6 which supports only c++17
+if( ${QT_VERSION_MAJOR} EQUAL 5 AND ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" ) )
   # Bad hack to fix compilation with gcc 11 - for some reason it's ignoring
   # the c++ standard version set for the target in BUILD_SIP_PYTHON_MODULE!
   add_definitions(-std=c++14)

python/core/auto_generated/qgslogger.sip.in

@@ -13,6 +13,7 @@
 
 
 
+
 class QgsLogger
 {
 %Docstring(signature="appended")
@@ -37,7 +38,9 @@ to this file rather than to stdout.
 %End
   public:
 
-    static void debug( const QString &msg, int debuglevel = 1, const char *file = 0, const char *function = 0, int line = -1 );
+
+
+    static void debug( const QString &msg, int debuglevel = QGS_LOG_LVL_DEBUG, const char *file = 0, const char *function = 0, int line = -1 );
 %Docstring
 Goes to qDebug.
 
@@ -48,13 +51,18 @@ Goes to qDebug.
 :param line: place in file where the message comes from
 %End
 
-    static void debug( const QString &var, int val, int debuglevel = 1, const char *file = 0, const char *function = 0, int line = -1 );
+    static void debug( const QString &var, int val, int debuglevel = QGS_LOG_LVL_DEBUG, const char *file = 0, const char *function = 0, int line = -1 );
 %Docstring
 Similar to the previous method, but prints a variable int-value pair
 %End
 
 
 
+    static void info( const QString &msg );
+%Docstring
+Goes to qInfo.
+%End
+
     static void warning( const QString &msg );
 %Docstring
 Goes to qWarning.
@@ -70,21 +78,24 @@ Goes to qCritical.
 Goes to qFatal.
 %End
 
+
+
+
     static int debugLevel();
 %Docstring
 Reads the environment variable QGIS_DEBUG and converts it to int. If QGIS_DEBUG is not set,
 the function returns 1 if QGISDEBUG is defined and 0 if not.
-%End
-
-    static void logMessageToFile( const QString &message );
-%Docstring
-Logs the message passed in to the logfile defined in QGIS_LOG_FILE if any.
 %End
 
     static QString logFile();
 %Docstring
 Reads the environment variable QGIS_LOG_FILE. Returns NULL if the variable is not set,
 otherwise returns a file name for writing log messages to.
+%End
+
+    static QString logFormat();
+%Docstring
+Returns the log format used by qgis.
 %End
 
 };

python/core/auto_generated/qgsmaplayer.sip.in

@@ -2281,6 +2281,33 @@ QFlags<QgsMapLayer::ReadFlag> operator|(QgsMapLayer::ReadFlag f1, QFlags<QgsMapL
 
 
 
+
+class QgsDummyLayer : QgsMapLayer
+{
+%Docstring(signature="appended")
+
+Represents a fake/dummy map layer
+
+.. versionadded:: 3.36
+%End
+
+%TypeHeaderCode
+#include "qgsmaplayer.h"
+%End
+  public:
+    QgsDummyLayer( Qgis::LayerType type, const QString &name = QString() );
+%Docstring
+Default constructor
+%End
+    virtual QgsMapLayer *clone() const;
+    virtual QgsMapLayerRenderer *createMapRenderer( QgsRenderContext & );
+    virtual bool readSymbology( const QDomNode &, QString &, QgsReadWriteContext &, StyleCategories );
+    virtual bool writeSymbology( QDomNode &, QDomDocument &, QString &,
+                                 const QgsReadWriteContext &, QgsMapLayer::StyleCategories ) const;
+
+    virtual void setTransformContext( const QgsCoordinateTransformContext & );
+};
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

python/core/qgsexception.sip

@@ -22,51 +22,57 @@
 %End
 };
 
-%Exception QgsException(SIP_Exception) /PyName=QgsException/
+%Exception QgsProviderConnectionException(SIP_Exception) /PyName=QgsProviderConnectionException/
 {
 %TypeHeaderCode
 #include <qgsexception.h>
 %End
 %RaiseCode
   SIP_BLOCK_THREADS
-  PyErr_SetString(sipException_QgsException, sipExceptionRef.what().toUtf8().constData() );
+  PyErr_SetString(sipException_QgsProviderConnectionException, sipExceptionRef.what().toUtf8().constData() );
   SIP_UNBLOCK_THREADS
 %End
 };
 
-
-%Exception QgsProviderConnectionException(SIP_Exception) /PyName=QgsProviderConnectionException/
+%Exception QgsNotSupportedException(SIP_Exception) /PyName=QgsNotSupportedException/
 {
 %TypeHeaderCode
 #include <qgsexception.h>
 %End
 %RaiseCode
   SIP_BLOCK_THREADS
-  PyErr_SetString(sipException_QgsProviderConnectionException, sipExceptionRef.what().toUtf8().constData() );
+  PyErr_SetString(sipException_QgsNotSupportedException, sipExceptionRef.what().toUtf8().constData() );
   SIP_UNBLOCK_THREADS
 %End
 };
 
-%Exception QgsNotSupportedException(SIP_Exception) /PyName=QgsNotSupportedException/
+%Exception QgsSettingsException(SIP_Exception) /PyName=QgsSettingsException/
 {
 %TypeHeaderCode
 #include <qgsexception.h>
 %End
 %RaiseCode
   SIP_BLOCK_THREADS
-  PyErr_SetString(sipException_QgsNotSupportedException, sipExceptionRef.what().toUtf8().constData() );
+  PyErr_SetString(sipException_QgsSettingsException, sipExceptionRef.what().toUtf8().constData() );
   SIP_UNBLOCK_THREADS
 %End
 };
 
-%Exception QgsSettingsException(SIP_Exception) /PyName=QgsSettingsException/
+// IMPORTANT -- QgsException MUST be last listed, or it will greedily prevent the more
+// specialized exceptions from being raised
+
+%Exception QgsException(SIP_Exception) /PyName=QgsException/
 {
 %TypeHeaderCode
 #include <qgsexception.h>
 %End
 %RaiseCode
   SIP_BLOCK_THREADS
-  PyErr_SetString(sipException_QgsSettingsException, sipExceptionRef.what().toUtf8().constData() );
+  PyErr_SetString(sipException_QgsException, sipExceptionRef.what().toUtf8().constData() );
   SIP_UNBLOCK_THREADS
 %End
 };
+
+// IMPORTANT -- QgsException MUST be last listed, or it will greedily prevent the more
+// specialized exceptions from being raised
+

python/plugins/grassprovider/tests/AlgorithmsTestBase.py

@@ -46,8 +46,9 @@
                        QgsProcessingFeedback)
 from qgis.analysis import (QgsNativeAlgorithms)
 from qgis.testing import (_UnexpectedSuccess,
-                          start_app,
-                          unittest)
+                          QgisTestCase,
+                          start_app)
+
 from utilities import unitTestDataPath
 
 import processing
@@ -391,7 +392,7 @@ def check_results(self, results, context, params, expected):
                     self.assertRegex(data, rule)
 
 
-class GenericAlgorithmsTest(unittest.TestCase):
+class GenericAlgorithmsTest(QgisTestCase):
     """
     General (non-provider specific) algorithm tests
     """

python/plugins/grassprovider/tests/Grass7AlgorithmsImageryTest.py

@@ -26,14 +26,14 @@
 
 from qgis.core import QgsApplication
 from qgis.testing import (
-    start_app,
-    unittest
+    QgisTestCase,
+    start_app
 )
 from grassprovider.Grass7AlgorithmProvider import Grass7AlgorithmProvider
 from grassprovider.Grass7Utils import Grass7Utils
 
 
-class TestGrass7AlgorithmsImageryTest(unittest.TestCase, AlgorithmsTestBase.AlgorithmsTest):
+class TestGrass7AlgorithmsImageryTest(QgisTestCase, AlgorithmsTestBase.AlgorithmsTest):
 
     @classmethod
     def setUpClass(cls):

python/plugins/grassprovider/tests/Grass7AlgorithmsRasterTestPt1.py

@@ -26,14 +26,15 @@
 
 from qgis.core import QgsApplication
 from qgis.testing import (
-    start_app,
-    unittest
+    QgisTestCase,
+    start_app
+
 )
 from grassprovider.Grass7AlgorithmProvider import Grass7AlgorithmProvider
 from grassprovider.Grass7Utils import Grass7Utils
 
 
-class TestGrass7AlgorithmsRasterTest(unittest.TestCase, AlgorithmsTestBase.AlgorithmsTest):
+class TestGrass7AlgorithmsRasterTest(QgisTestCase, AlgorithmsTestBase.AlgorithmsTest):
 
     @classmethod
     def setUpClass(cls):

python/plugins/grassprovider/tests/Grass7AlgorithmsRasterTestPt2.py

@@ -32,8 +32,8 @@
     QgsProcessingFeedback
 )
 from qgis.testing import (
-    start_app,
-    unittest
+    QgisTestCase,
+    start_app
 )
 from grassprovider.Grass7AlgorithmProvider import Grass7AlgorithmProvider
 from grassprovider.Grass7Utils import Grass7Utils
@@ -42,7 +42,7 @@
 testDataPath = os.path.join(os.path.dirname(__file__), 'testdata')
 
 
-class TestGrass7AlgorithmsRasterTest(unittest.TestCase, AlgorithmsTestBase.AlgorithmsTest):
+class TestGrass7AlgorithmsRasterTest(QgisTestCase, AlgorithmsTestBase.AlgorithmsTest):
 
     @classmethod
     def setUpClass(cls):

python/plugins/grassprovider/tests/Grass7AlgorithmsVectorTest.py

@@ -37,8 +37,8 @@
                        QgsProcessingFeedback,
                        QgsProcessingFeatureSourceDefinition)
 from qgis.testing import (
-    start_app,
-    unittest
+    QgisTestCase,
+    start_app
 )
 from grassprovider.Grass7AlgorithmProvider import Grass7AlgorithmProvider
 from grassprovider.Grass7Utils import Grass7Utils
@@ -47,7 +47,7 @@
 testDataPath = os.path.join(os.path.dirname(__file__), 'testdata')
 
 
-class TestGrass7AlgorithmsVectorTest(unittest.TestCase, AlgorithmsTestBase.AlgorithmsTest):
+class TestGrass7AlgorithmsVectorTest(QgisTestCase, AlgorithmsTestBase.AlgorithmsTest):
 
     @classmethod
     def setUpClass(cls):