Skip to content

Commit 03ab8bf

Browse files
committed
Run all tests
1 parent 98355c6 commit 03ab8bf

File tree

6 files changed

+120
-144
lines changed

6 files changed

+120
-144
lines changed

.ci/test_blocklist_qt6.txt

+1-144
Original file line numberDiff line numberDiff line change
@@ -39,147 +39,4 @@ PyQgsProviderConnectionMssql
3939
PyQgsStyleStorageMssql
4040

4141
# To be fixed
42-
PyQgsAFSProvider
43-
PyQgsAggregateMappingWidget
44-
PyQgsPythonProvider
45-
PyQgsAggregateCalculator
46-
PyQgsAnnotation
47-
PyQgsAuthenticationSystem
48-
PyQgsBlockingProcess
49-
PyQgsBookmarkModel
50-
PyQgsCodeEditor
51-
PyQgsColorRampLegendNode
52-
PyQgsCombinedStyleModel
53-
PyQgsConnectionRegistry
54-
PyQgsDateTimeStatisticalSummary
55-
PyQgsDelimitedTextProvider
56-
PyQgsEditWidgets
57-
PyQgsElevationProfileCanvas
58-
PyQgsFieldFormattersTest
59-
PyQgsProject
60-
PyQgsProjectStyleSettings
61-
PyQgsFeatureRequest
62-
PyQgsFields
63-
PyQgsFieldModel
64-
PyQgsFieldMappingWidget
65-
PyQgsFloatingWidget
66-
PyQgsGeometryTest
67-
PyQgsJsonUtils
68-
PyQgsLabelObstacleSettings
69-
PyQgsLabelSettingsWidget
70-
PyQgsLabelThinningSettings
71-
PyQgsLayerMetadata
72-
PyQgsLayerMetadataProviderPython
73-
PyQgsLayerMetadataResultsModel
74-
PyQgsLayoutAtlas
75-
PyQgsLayoutExporter
76-
PyQgsLayoutManagerModel
77-
PyQgsLayoutPageCollection
78-
PyQgsLayoutView
79-
PyQgsLayoutGuide
80-
PyQgsLayoutHtml
81-
PyQgsLayoutItem
82-
PyQgsLayoutLegend
83-
PyQgsLayoutMap
84-
PyQgsLayoutMapGrid
85-
PyQgsLayoutMarker
86-
PyQgsLayoutPolygon
87-
PyQgsLayoutPolyline
88-
PyQgsLineSymbolLayers
89-
PyQgsLocator
90-
PyQgsMapBoxGlStyleConverter
91-
PyQgsMapLayerModel
92-
PyQgsMetadataBase
93-
PyQgsMemoryProvider
94-
PyQgsNetworkAccessManager
95-
PyQgsOGRProviderGpkg
96-
PyQgsPalLabelingBase
97-
PyQgsPalLabelingCanvas
98-
PyQgsPalLabelingLayout
99-
PyQgsPalLabelingPlacement
100-
PyQgsPlot
101-
PyQgsPointCloudAttributeModel
102-
PyQgsPointCloudClassifiedRenderer
103-
PyQgsProcessExecutablePt1
104-
PyQgsProcessExecutablePt2
105-
PyQgsProcessingInPlace
106-
PyQgsProcessingAlgRunner
107-
PyQgsProcessingParameters
108-
PyQgsProcessingPackageLayersAlgorithm
109-
PyQgsProjectMetadata
110-
PyQgsProviderConnectionModel
111-
PyQgsProviderConnectionGpkg
112-
PyQgsProviderConnectionSpatialite
113-
PyQgsSensorModel
114-
PyQgsProviderSublayerDetails
115-
PyQgsRasterAttributeTable
116-
PyQgsRasterAttributeTableModel
117-
PyQgsRasterLayer
118-
PyQgsRasterLayerRenderer
119-
PyQgsRasterPipe
120-
PyQgsProviderUtils
121-
PyQgsShapefileProvider
122-
PyQgsTextRenderer
123-
PyQgsOGRProvider
124-
PyQgsSimpleLineSymbolLayer
125-
PyQgsSpatialiteProvider
126-
PyQgsRasterRendererCreateSld
127-
PyQgsSymbolLayerCreateSld
128-
PyQgsSymbolLayerReadSld
129-
PyQgsStringUtils
130-
PyQgsStyleModel
131-
PyQgsTextDocument
132-
PyQgsValidityChecks
133-
PyQgsValidityResultsWidget
134-
PyQgsVectorLayer
135-
PyQgsVectorLayerElevationProperties
136-
PyQgsVectorLayerCache
137-
PyQgsVectorLayerEditBuffer
138-
PyQgsVectorLayerEditUtils
139-
PyQgsVectorLayerProfileGenerator
140-
PyQgsVectorLayerUtils
141-
PyQgsZonalStatistics
142-
PyQgsVirtualLayerProvider
143-
PyQgsLayerDefinition
144-
PyQgsWFSProvider
145-
PyQgsDBManagerGpkg
146-
PyQgsDBManagerSpatialite
147-
PyQgsSettings
148-
PyQgsSettingsEntry
149-
PyQgsSettingsTreeNode
150-
PyQgsAuxiliaryStorage
151-
PyQgsDBManagerSQLWindow
152-
PyQgsSelectiveMasking
153-
PyQgsServerApi
154-
PyQgsServerWMSGetFeatureInfo
155-
PyQgsServerWMSGetMap
156-
PyQgsServerWMSGetLegendGraphic
157-
PyQgsServerWMSGetPrint
158-
PyQgsServerWMSGetPrintExtra
159-
PyQgsServerWMSGetPrintOutputs
160-
PyQgsServerWMSGetPrintAtlas
161-
PyQgsServerWMSDimension
162-
PyQgsServerSettings
163-
PyQgsServerAccessControlWMSGetlegendgraphic
164-
PyQgsServerAccessControlWFSTransactional
165-
PyQgsServerWFS
166-
ProcessingGeneralTest
167-
ProcessingGuiTest
168-
ProcessingProjectProviderTest
169-
ProcessingParametersTest
170-
ProcessingGenericAlgorithmsTest
171-
ProcessingQgisAlgorithmsTestPt1
172-
ProcessingQgisAlgorithmsTestPt2
173-
ProcessingQgisAlgorithmsTestPt3
174-
ProcessingQgisAlgorithmsTestPt4
175-
ProcessingQgisAlgorithmsTestPt5
176-
ProcessingGdalAlgorithmsGeneralTest
177-
ProcessingGdalAlgorithmsRasterTest
178-
ProcessingGdalAlgorithmsVectorTest
179-
ProcessingCheckValidityAlgorithmTest
180-
ProcessingGrass7AlgorithmsImageryTest
181-
ProcessingGrass7AlgorithmsRasterTestPt1
182-
ProcessingGrass7AlgorithmsRasterTestPt2
183-
ProcessingGrass7AlgorithmsVectorTest
184-
PyQgsCoordinateReferenceSystemModel
185-
PyQgsProviderRegistry
42+

python/PyQt6/core/auto_additions/qgis.py

+18
Original file line numberDiff line numberDiff line change
@@ -1671,6 +1671,24 @@
16711671
Qgis.MakeValidMethod.__doc__ = "Algorithms to use when repairing invalid geometries.\n\n.. versionadded:: 3.28\n\n" + '* ``Linework``: ' + Qgis.MakeValidMethod.Linework.__doc__ + '\n' + '* ``Structure``: ' + Qgis.MakeValidMethod.Structure.__doc__
16721672
# --
16731673
Qgis.MakeValidMethod.baseClass = Qgis
1674+
QgsFeatureRequest.Flag = Qgis.FeatureRequestFlag
1675+
Qgis.NoFlags = Qgis.FeatureRequestFlag.NoFlags
1676+
Qgis.NoGeometry = Qgis.FeatureRequestFlag.NoGeometry
1677+
Qgis.SubsetOfAttributes = Qgis.FeatureRequestFlag.SubsetOfAttributes
1678+
Qgis.ExactIntersect = Qgis.FeatureRequestFlag.ExactIntersect
1679+
Qgis.IgnoreStaticNodesDuringExpressionCompilation = Qgis.FeatureRequestFlag.IgnoreStaticNodesDuringExpressionCompilation
1680+
Qgis.EmbeddedSymbols = Qgis.FeatureRequestFlag.EmbeddedSymbols
1681+
Qgis.FeatureRequestFlag.baseClass = Qgis
1682+
Qgis.FeatureRequestFlags = lambda flags=0: Qgis.FeatureRequestFlag(flags)
1683+
Qgis.FeatureRequestFlags.baseClass = Qgis
1684+
FeatureRequestFlags = Qgis # dirty hack since SIP seems to introduce the flags in module
1685+
Qgis.FilterNone = Qgis.FilterType.FilterNone
1686+
Qgis.FilterFid = Qgis.FilterType.FilterFid
1687+
Qgis.FilterExpression = Qgis.FilterType.FilterExpression
1688+
Qgis.FilterFids = Qgis.FilterType.FilterFids
1689+
Qgis.GeometryNoCheck = Qgis.InvalidGeometryCheck.GeometryNoCheck
1690+
Qgis.GeometrySkipInvalid = Qgis.InvalidGeometryCheck.GeometrySkipInvalid
1691+
Qgis.GeometryAbortOnInvalid = Qgis.InvalidGeometryCheck.GeometryAbortOnInvalid
16741692
# monkey patching scoped based enum
16751693
Qgis.SpatialFilterType.NoFilter.__doc__ = "No spatial filtering of features"
16761694
Qgis.SpatialFilterType.BoundingBox.__doc__ = "Filter using a bounding box"

python/PyQt6/core/auto_generated/qgis.sip.in

+29
Original file line numberDiff line numberDiff line change
@@ -981,6 +981,35 @@ The development version
981981
Structure,
982982
};
983983

984+
enum FeatureRequestFlag /BaseType=IntFlag/
985+
{
986+
NoFlags,
987+
NoGeometry,
988+
SubsetOfAttributes,
989+
ExactIntersect,
990+
IgnoreStaticNodesDuringExpressionCompilation,
991+
EmbeddedSymbols,
992+
};
993+
994+
typedef QFlags<Qgis::FeatureRequestFlag> FeatureRequestFlags;
995+
996+
997+
998+
enum FilterType
999+
{
1000+
FilterNone,
1001+
FilterFid,
1002+
FilterExpression,
1003+
FilterFids
1004+
};
1005+
1006+
enum InvalidGeometryCheck
1007+
{
1008+
GeometryNoCheck,
1009+
GeometrySkipInvalid,
1010+
GeometryAbortOnInvalid,
1011+
};
1012+
9841013
enum class SpatialFilterType /BaseType=IntFlag/
9851014
{
9861015
NoFilter,

python/core/auto_additions/qgis.py

+4
Original file line numberDiff line numberDiff line change
@@ -1640,6 +1640,10 @@
16401640
Qgis.MakeValidMethod.__doc__ = "Algorithms to use when repairing invalid geometries.\n\n.. versionadded:: 3.28\n\n" + '* ``Linework``: ' + Qgis.MakeValidMethod.Linework.__doc__ + '\n' + '* ``Structure``: ' + Qgis.MakeValidMethod.Structure.__doc__
16411641
# --
16421642
Qgis.MakeValidMethod.baseClass = Qgis
1643+
QgsFeatureRequest.Flag = Qgis.FeatureRequestFlag
1644+
Qgis.FeatureRequestFlag.baseClass = Qgis
1645+
Qgis.FeatureRequestFlags.baseClass = Qgis
1646+
FeatureRequestFlags = Qgis # dirty hack since SIP seems to introduce the flags in module
16431647
# monkey patching scoped based enum
16441648
Qgis.SpatialFilterType.NoFilter.__doc__ = "No spatial filtering of features"
16451649
Qgis.SpatialFilterType.BoundingBox.__doc__ = "Filter using a bounding box"

python/core/auto_generated/qgis.sip.in

+29
Original file line numberDiff line numberDiff line change
@@ -981,6 +981,35 @@ The development version
981981
Structure,
982982
};
983983

984+
enum FeatureRequestFlag
985+
{
986+
NoFlags,
987+
NoGeometry,
988+
SubsetOfAttributes,
989+
ExactIntersect,
990+
IgnoreStaticNodesDuringExpressionCompilation,
991+
EmbeddedSymbols,
992+
};
993+
994+
typedef QFlags<Qgis::FeatureRequestFlag> FeatureRequestFlags;
995+
996+
997+
998+
enum FilterType
999+
{
1000+
FilterNone,
1001+
FilterFid,
1002+
FilterExpression,
1003+
FilterFids
1004+
};
1005+
1006+
enum InvalidGeometryCheck
1007+
{
1008+
GeometryNoCheck,
1009+
GeometrySkipInvalid,
1010+
GeometryAbortOnInvalid,
1011+
};
1012+
9841013
enum class SpatialFilterType
9851014
{
9861015
NoFilter,

src/core/qgis.h

+39
Original file line numberDiff line numberDiff line change
@@ -1644,6 +1644,45 @@ class CORE_EXPORT Qgis
16441644
};
16451645
Q_ENUM( MakeValidMethod )
16461646

1647+
enum FeatureRequestFlag SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsFeatureRequest, Flag ) : int
1648+
{
1649+
NoFlags = 0,
1650+
NoGeometry = 1, //!< Geometry is not required. It may still be returned if e.g. required for a filter condition.
1651+
SubsetOfAttributes = 2, //!< Fetch only a subset of attributes (setSubsetOfAttributes sets this flag)
1652+
ExactIntersect = 4, //!< Use exact geometry intersection (slower) instead of bounding boxes
1653+
IgnoreStaticNodesDuringExpressionCompilation = 8, //!< If a feature request uses a filter expression which can be partially precalculated due to static nodes in the expression, setting this flag will prevent these precalculated values from being utilized during compilation of the filter for the backend provider. This flag significantly slows down feature requests and should be used for debugging purposes only. (Since QGIS 3.18)
1654+
EmbeddedSymbols = 16, //!< Retrieve any embedded feature symbology (since QGIS 3.20)
1655+
};
1656+
Q_ENUM( FeatureRequestFlag )
1657+
1658+
/**
1659+
* Flags for raster layer temporal capabilities.
1660+
*
1661+
* \since QGIS 3.28
1662+
*/
1663+
Q_DECLARE_FLAGS( FeatureRequestFlags, FeatureRequestFlag )
1664+
Q_FLAG( FeatureRequestFlags )
1665+
1666+
1667+
/**
1668+
* Types of filters.
1669+
*/
1670+
enum FilterType
1671+
{
1672+
FilterNone, //!< No filter is applied
1673+
FilterFid, //!< Filter using feature ID
1674+
FilterExpression, //!< Filter using expression
1675+
FilterFids //!< Filter using feature IDs
1676+
};
1677+
1678+
//! Handling of features with invalid geometries
1679+
enum InvalidGeometryCheck
1680+
{
1681+
GeometryNoCheck = 0, //!< No invalid geometry checking
1682+
GeometrySkipInvalid = 1, //!< Skip any features with invalid geometry. This requires a slow geometry validity check for every feature.
1683+
GeometryAbortOnInvalid = 2, //!< Close iterator on encountering any features with invalid geometry. This requires a slow geometry validity check for every feature.
1684+
};
1685+
16471686
/**
16481687
* Feature request spatial filter types.
16491688
*

0 commit comments

Comments
 (0)