qgis · nyalldawson · Jun 21, 2021 · May 1, 2021 · May 16, 2021 · May 7, 2021
diff --git a/.github/workflows/code_layout.yml b/.github/workflows/code_layout.yml
@@ -7,6 +7,10 @@ on:
       - release-**
       - queued_ltr_backports
   pull_request:
+    branches:
+      - master
+      - release-**
+      - queued_ltr_backports
 
 jobs:
   documentation_checks:

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -18,6 +18,7 @@ on:
     branches:
       - master
       - release-**
+      - queued_ltr_backports
     paths:
     - 'src/**'
     - 'external/**'

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -19,6 +19,7 @@ on:
     branches:
       - master
       - release-**
+      - queued_ltr_backports
     paths:
     - 'src/**'
     - 'external/**'

diff --git a/python/__init__.py b/python/__init__.py
@@ -55,10 +55,14 @@ def setupenv():
 
     with open(envfile) as f:
         for line in f:
-            linedata = line.split("=")
-            name = linedata[0]
-            data = linedata[1]
-            os.environ[name] = data
+            line = line.rstrip("\n")
+            if line.startswith("#") or not line:
+                continue
+            try:
+                env_key, env_value = line.split("=", maxsplit=1)
+                os.environ[env_key] = env_value
+            except ValueError:
+                pass
 
 
 if os.name == 'nt':

diff --git a/python/analysis/auto_generated/vector/qgszonalstatistics.sip.in b/python/analysis/auto_generated/vector/qgszonalstatistics.sip.in
@@ -130,7 +130,9 @@ Returns a short, friendly display name for a ``statistic``, suitable for use in
 .. versionadded:: 3.12
 %End
 
-    static QMap<QgsZonalStatistics::Statistic, QVariant> calculateStatistics( QgsRasterInterface *rasterInterface, const QgsGeometry &geometry, double cellSizeX, double cellSizeY, int rasterBand, QgsZonalStatistics::Statistics statistics );
+
+
+    static QMap<int, QVariant> calculateStatisticsInt( QgsRasterInterface *rasterInterface, const QgsGeometry &geometry, double cellSizeX, double cellSizeY, int rasterBand, QgsZonalStatistics::Statistics statistics ) /PyName=calculateStatistics/;
 %Docstring
 Calculates the specified ``statistics`` for the pixels of ``rasterBand``
 in ``rasterInterface`` (a raster layer :py:func:`~QgsZonalStatistics.dataProvider` ) within polygon ``geometry``.

diff --git a/python/core/auto_generated/geometry/qgscurve.sip.in b/python/core/auto_generated/geometry/qgscurve.sip.in
@@ -60,6 +60,19 @@ Returns the end point of the curve.
     virtual bool isClosed() const /HoldGIL/;
 %Docstring
 Returns ``True`` if the curve is closed.
+
+.. seealso:: :py:func:`isClosed2D`
+%End
+
+    virtual bool isClosed2D() const /HoldGIL/;
+%Docstring
+Returns true if the curve is closed.
+
+Unlike isClosed. It looks only for XY coordinates.
+
+.. seealso:: :py:func:`isClosed`
+
+.. versionadded:: 3.20
 %End
 
     virtual bool isRing() const /HoldGIL/;

diff --git a/python/core/auto_generated/geometry/qgslinestring.sip.in b/python/core/auto_generated/geometry/qgslinestring.sip.in
@@ -420,6 +420,10 @@ segment in the line.
 
     virtual bool removeDuplicateNodes( double epsilon = 4 * DBL_EPSILON, bool useZValues = false );
 
+    virtual bool isClosed() const /HoldGIL/;
+
+    virtual bool isClosed2D() const /HoldGIL/;
+
 
     QVector< QgsVertexId > collectDuplicateNodes( double epsilon = 4 * DBL_EPSILON, bool useZValues = false ) const;
 %Docstring

diff --git a/python/core/auto_generated/qgsfeaturefiltermodel.sip.in b/python/core/auto_generated/qgsfeaturefiltermodel.sip.in
@@ -97,6 +97,9 @@ Allows specifying one value that does not need to match the filter criteria but
 still be available in the model.
 %End
 
+  private:
+    virtual void requestToReloadCurrentFeature( QgsFeatureRequest &request );
+
 };
 
 /************************************************************************

diff --git a/python/core/auto_generated/qgsvectorlayertemporalproperties.sip.in b/python/core/auto_generated/qgsvectorlayertemporalproperties.sip.in
@@ -328,7 +328,7 @@ occur before or within the map's temporal range should be rendered).
 .. seealso:: :py:func:`accumulateFeatures`
 %End
 
-    QString createFilterString( const QgsVectorLayerTemporalContext &context, const QgsDateTimeRange &range ) const;
+    QString createFilterString( QgsVectorLayerTemporalContext context, const QgsDateTimeRange &range ) const;
 %Docstring
 Creates a QGIS expression filter string for filtering features within
 the specified ``context`` to those within the specified time ``range``.

diff --git a/python/gui/auto_generated/qgsmapcanvas.sip.in b/python/gui/auto_generated/qgsmapcanvas.sip.in
@@ -21,7 +21,7 @@
 
 
 
-class QgsMapCanvas : QGraphicsView
+class QgsMapCanvas : QGraphicsView, QgsExpressionContextGenerator
 {
 %Docstring
 Map canvas is a class for displaying all GIS data types on a canvas.
@@ -694,7 +694,7 @@ overrides for expression evaluation for the map canvas render.
 %End
 
 
-    QgsExpressionContextScope *defaultExpressionContextScope() /Factory/;
+    QgsExpressionContextScope *defaultExpressionContextScope() const /Factory/;
 %Docstring
 Creates a new scope which contains default variables and functions relating to the map canvas.
 
@@ -705,6 +705,9 @@ Creates a new scope which contains default variables and functions relating to t
 .. versionadded:: 3.4
 %End
 
+    virtual QgsExpressionContext createExpressionContext() const;
+
+
     void setSegmentationTolerance( double tolerance );
 %Docstring
 Sets the segmentation tolerance applied when rendering curved geometries

diff --git a/python/gui/auto_generated/qgspixmaplabel.sip.in b/python/gui/auto_generated/qgspixmaplabel.sip.in
@@ -45,9 +45,16 @@ determined from the width with the given aspect ratio.
 %End
 
   public slots:
+
     void setPixmap( const QPixmap & );
     virtual void resizeEvent( QResizeEvent * );
 
+
+    void clear();
+%Docstring
+Clears any label contents.
+%End
+
 };
 
 /************************************************************************

diff --git a/python/gui/auto_generated/symbology/qgs25drendererwidget.sip.in b/python/gui/auto_generated/symbology/qgs25drendererwidget.sip.in
@@ -33,6 +33,7 @@ Constructor
 :param style:
 :param renderer: the mask renderer (will not take ownership)
 %End
+    ~Qgs25DRendererWidget();
 
     virtual QgsFeatureRenderer *renderer();
 

diff --git a/python/gui/auto_generated/symbology/qgscategorizedsymbolrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgscategorizedsymbolrendererwidget.sip.in
@@ -88,6 +88,10 @@ from the XML file with a matching name.
 .. versionadded:: 2.9
 %End
 
+  protected:
+    virtual void setSymbolLevels( const QgsLegendSymbolList &levels, bool enabled );
+
+
   protected slots:
 
     virtual void pasteSymbolToSelection();

diff --git a/python/gui/auto_generated/symbology/qgsgraduatedsymbolrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsgraduatedsymbolrendererwidget.sip.in
@@ -71,6 +71,10 @@ Refreshes the ranges for the renderer.
 The ``reset`` argument is deprecated and has no effect.
 %End
 
+  protected:
+    virtual void setSymbolLevels( const QgsLegendSymbolList &levels, bool enabled );
+
+
   protected slots:
 
     virtual void pasteSymbolToSelection();

diff --git a/python/gui/auto_generated/symbology/qgsheatmaprendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsheatmaprendererwidget.sip.in
@@ -33,6 +33,7 @@ Constructor
 :param style:
 :param renderer: the mask renderer (will not take ownership)
 %End
+    ~QgsHeatmapRendererWidget();
 
     virtual QgsFeatureRenderer *renderer();
 

diff --git a/python/gui/auto_generated/symbology/qgsinvertedpolygonrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsinvertedpolygonrendererwidget.sip.in
@@ -38,6 +38,7 @@ Constructor
 :param style:
 :param renderer: the mask renderer (will not take ownership)
 %End
+    ~QgsInvertedPolygonRendererWidget();
 
     virtual QgsFeatureRenderer *renderer();
 

diff --git a/python/gui/auto_generated/symbology/qgsrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsrendererwidget.sip.in
@@ -72,6 +72,7 @@ This method should be called whenever the renderer is actually set on the layer.
     virtual void setDockMode( bool dockMode );
 
 
+
   signals:
 
     void layerVariablesChanged();
@@ -81,9 +82,12 @@ vector layers have been changed. Will request the parent dialog
 to re-synchronize with the variables.
 %End
 
-    void symbolLevelsChanged();
+ void symbolLevelsChanged() /Deprecated/;
 %Docstring
 Emitted when the symbol levels settings have been changed.
+
+.. deprecated:: QGIS 3.16.9
+   -- no longer emitted.
 %End
 
   protected:
@@ -104,6 +108,17 @@ Creates widget to setup data-defined size legend.
 Returns newly created panel - may be ``None`` if it could not be opened. Ownership is transferred to the caller.
 
 .. versionadded:: 3.0
+%End
+
+    virtual void setSymbolLevels( const QList< QgsLegendSymbolItem > &levels, bool enabled );
+%Docstring
+Sets the symbol levels for the renderer defined in the widget.
+
+The ``levels`` argument defines the updated list of symbols with rendering passes set.
+
+The ``enabled`` arguments specifies if symbol levels should be enabled for the renderer.
+
+.. versionadded:: 3.16.9
 %End
 
   protected slots:

diff --git a/python/gui/auto_generated/symbology/qgsrulebasedrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsrulebasedrendererwidget.sip.in
@@ -140,6 +140,9 @@ Opens the dialog for refining a rule using ranges
 %End
     void refineRuleScalesGui( const QModelIndexList &index );
 
+    virtual void setSymbolLevels( const QList< QgsLegendSymbolItem > &levels, bool enabled );
+
+
     QgsRuleBasedRenderer::Rule *currentRule();
 
     virtual QList<QgsSymbol *> selectedSymbols();

diff --git a/python/gui/auto_generated/symbology/qgssinglesymbolrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgssinglesymbolrendererwidget.sip.in
@@ -26,15 +26,12 @@ class QgsSingleSymbolRendererWidget : QgsRendererWidget
 
     virtual void setContext( const QgsSymbolWidgetContext &context );
 
-
     virtual void setDockMode( bool dockMode );
 
-%Docstring
-Set the widget in dock mode which tells the widget to emit panel
-widgets and not open dialogs
 
-:param dockMode: ``True`` to enable dock mode.
-%End
+  protected:
+    virtual void setSymbolLevels( const QList< QgsLegendSymbolItem > &levels, bool enabled );
+
 
 };
 

diff --git a/python/gui/auto_generated/symbology/qgssymbollevelsdialog.sip.in b/python/gui/auto_generated/symbology/qgssymbollevelsdialog.sip.in
@@ -23,14 +23,29 @@ A widget which allows the user to modify the rendering order of symbol layers.
 #include "qgssymbollevelsdialog.h"
 %End
   public:
+
     QgsSymbolLevelsWidget( QgsFeatureRenderer *renderer, bool usingSymbolLevels, QWidget *parent /TransferThis/ = 0 );
 %Docstring
 Constructor for QgsSymbolLevelsWidget
+%End
+
+    QgsSymbolLevelsWidget( const QgsLegendSymbolList &symbols, bool usingSymbolLevels, QWidget *parent /TransferThis/ = 0 );
+%Docstring
+Constructor for QgsSymbolLevelsWidget, which takes a list of ``symbols`` to show in the dialog.
+
+.. versionadded:: 3.20
 %End
 
     bool usingLevels() const;
 %Docstring
 Returns whether the level ordering is enabled
+%End
+
+    QgsLegendSymbolList symbolLevels() const;
+%Docstring
+Returns the current legend symbols with rendering passes set, as defined in the widget.
+
+.. versionadded:: 3.20
 %End
 
     void setForceOrderingEnabled( bool enabled );
@@ -41,21 +56,18 @@ Sets whether the level ordering is always forced on and hide the checkbox (used
 %End
 
   public slots:
-    void apply();
-%Docstring
-Apply button
-%End
-
-  protected:
-
-
 
+ void apply() /Deprecated/;
+%Docstring
+Apply button.
 
-  private:
-    QgsSymbolLevelsWidget();
+.. deprecated:: QGIS 3.20.
+   Use symbolLevels() and manually apply the changes to the renderer as appropriate.
+%End
 
 };
 
+
 class QgsSymbolLevelsDialog : QDialog
 {
 %Docstring
@@ -76,6 +88,20 @@ Constructor for QgsSymbolLevelsDialog.
 
     void setForceOrderingEnabled( bool enabled );
 
+    bool usingLevels() const;
+%Docstring
+Returns whether the level ordering is enabled.
+
+.. versionadded:: 3.20
+%End
+
+    QgsLegendSymbolList symbolLevels() const;
+%Docstring
+Returns the current legend symbols with rendering passes set, as defined in the widget.
+
+.. versionadded:: 3.20
+%End
+
 };
 
 

diff --git a/python/plugins/processing/algs/grass7/ext/r_proj.py b/python/plugins/processing/algs/grass7/ext/r_proj.py
@@ -69,7 +69,7 @@ def processInputs(alg, parameters, context, feedback):
     if isWindows():
         # TODO: make some tests under a non POSIX shell
         alg.commands.append('set regVar=')
-        alg.commands.append('for /f "delims=" %%a in (\'r.proj -g input="{}" location="{}"\') do @set theValue=%%a'.format(
+        alg.commands.append('for /f "delims=" %%a in (\'r.proj -g input^="{}" location^="{}"\') do @set regVar=%%a'.format(
             grassName, newLocation))
         alg.commands.append('g.region -a %regVar%')
     else: