Skip to content

Commit

Permalink
Remove any trace of distutils use as it is going to be removed in pyt…
Browse files Browse the repository at this point in the history 
…hon 3.12 (fixes #51532)
  • Loading branch information
@rouault @nyalldawson
rouault authored and nyalldawson committed Apr 1, 2023
1 parent ce508f6 commit 28bd021
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 67 deletions.
7 changes: 5 additions & 2 deletions cmake/FindSIP.py
View file
Expand Up @@ -37,8 +37,11 @@
print("sip_version_num:%d" % sipbuild.version.SIP_VERSION)
print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)

from distutils.sysconfig import get_python_lib
python_modules_dir = get_python_lib(plat_specific=1)
import sysconfig
if "deb_system" in sysconfig.get_scheme_names():
python_modules_dir = sysconfig.get_path("purelib", "deb_system")
else:
python_modules_dir = sysconfig.get_path("purelib")
print("default_sip_dir:%s" % python_modules_dir)
except ImportError: # Code for SIP v4
import sipconfig
Expand Down
81 changes: 24 additions & 57 deletions tests/src/python/test_qgslayertreeview.py
View file
Expand Up @@ -9,12 +9,9 @@
__date__ = '02.04.2018'
__copyright__ = 'Copyright 2018, The QGIS Project'

from distutils.version import StrictVersion

import qgis # NOQA
from qgis.PyQt.Qt import PYQT_VERSION_STR
from qgis.PyQt.QtCore import QStringListModel
from qgis.PyQt.QtTest import QSignalSpy
from qgis.PyQt.QtTest import QSignalSpy, QAbstractItemModelTester
from qgis.core import (
QgsLayerTreeModel,
QgsProject,
Expand All @@ -26,17 +23,8 @@
QgsLayerTreeViewDefaultActions,
)
from qgis.testing import start_app, unittest

from utilities import (unitTestDataPath)

USE_MODEL_TESTER = False


if StrictVersion(PYQT_VERSION_STR) >= StrictVersion('5.11'):
from qgis.PyQt.QtTest import QAbstractItemModelTester
USE_MODEL_TESTER = True


app = start_app()
TEST_DATA_DIR = unitTestDataPath()

Expand All @@ -62,8 +50,7 @@ def __init__(self, methodName):
"layer5", "memory")
self.project.addMapLayers([self.layer, self.layer2, self.layer3])
self.model = QgsLayerTreeModel(self.project.layerTreeRoot())
if USE_MODEL_TESTER:
self.tester = QAbstractItemModelTester(self.model)
self.tester = QAbstractItemModelTester(self.model)

self.groupname = "group"
self.subgroupname = "sub-group"
Expand Down Expand Up @@ -92,16 +79,14 @@ def testSetModel(self):

# should work
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
self.assertEqual(view.layerTreeModel(), self.model)

def testSetCurrentLayer(self):

view = QgsLayerTreeView()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
current_layer_changed_spy = QSignalSpy(view.currentLayerChanged)
self.assertFalse(view.currentLayer())
view.setCurrentLayer(self.layer3)
Expand All @@ -117,8 +102,7 @@ def testSetCurrentLayer(self):
def testDefaultActions(self):
view = QgsLayerTreeView()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)

# show in overview action
Expand All @@ -142,8 +126,7 @@ def testMoveOutOfGroupActionLayer(self):
group.addLayer(self.layer5)
groupname = group.name()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
self.layer.name(),
Expand Down Expand Up @@ -171,8 +154,7 @@ def testMoveToTopActionLayer(self):

view = QgsLayerTreeView()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.project.layerTreeRoot().layerOrder(), [
self.layer, self.layer2, self.layer3])
Expand All @@ -191,8 +173,7 @@ def testMoveToTopActionGroup(self):
group.addLayer(self.layer5)
groupname = group.name()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
self.layer.name(),
Expand Down Expand Up @@ -225,8 +206,7 @@ def testMoveToTopActionEmbeddedGroup(self):
group.addLayer(self.layer5)
groupname = group.name()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
self.layer.name(),
Expand Down Expand Up @@ -258,8 +238,7 @@ def testMoveToTopActionLayerAndGroup(self):
group.addLayer(self.layer5)
groupname = group.name()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
self.layer.name(),
Expand Down Expand Up @@ -292,8 +271,7 @@ def testMoveToBottomActionLayer(self):

view = QgsLayerTreeView()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.project.layerTreeRoot().layerOrder(), [
self.layer, self.layer2, self.layer3])
Expand All @@ -312,8 +290,7 @@ def testMoveToBottomActionGroup(self):
group.addLayer(self.layer5)
groupname = group.name()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
groupname,
Expand Down Expand Up @@ -346,8 +323,7 @@ def testMoveToBottomActionEmbeddedGroup(self):
group.addLayer(self.layer5)
groupname = group.name()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
self.layer.name(),
Expand Down Expand Up @@ -379,8 +355,7 @@ def testMoveToBottomActionLayerAndGroup(self):
group.addLayer(self.layer5)
groupname = group.name()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
groupname,
Expand Down Expand Up @@ -417,8 +392,7 @@ def testAddGroupActionLayer(self):
group.addLayer(self.layer5)
groupname = group.name()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
groupname,
Expand Down Expand Up @@ -452,8 +426,7 @@ def testAddGroupActionLayers(self):
groupname = group.name()

view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
groupname,
Expand Down Expand Up @@ -491,8 +464,7 @@ def testAddGroupActionGroup(self):
group.addLayer(self.layer5)
groupname = group.name()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
groupname,
Expand Down Expand Up @@ -529,8 +501,7 @@ def testAddGroupActionGroups(self):
groupname2 = group2.name()

view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
actions = QgsLayerTreeViewDefaultActions(view)
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
groupname2,
Expand Down Expand Up @@ -567,8 +538,7 @@ def testSetLayerVisible(self):

view = QgsLayerTreeView()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
self.project.layerTreeRoot().findLayer(
self.layer).setItemVisibilityChecked(True)
self.project.layerTreeRoot().findLayer(
Expand All @@ -594,8 +564,7 @@ def testProxyModel(self):

view = QgsLayerTreeView()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
proxy_tester = QAbstractItemModelTester(view.model())
tree_model = view.layerTreeModel()
proxy_model = view.proxyModel()

Expand Down Expand Up @@ -660,9 +629,8 @@ def testProxyModelCurrentIndex(self):

view = QgsLayerTreeView()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
tree_tester = QAbstractItemModelTester(view.layerTreeModel())
proxy_tester = QAbstractItemModelTester(view.model())
tree_tester = QAbstractItemModelTester(view.layerTreeModel())

view.setCurrentLayer(self.layer3)
self.layer3.setFlags(self.layer.Private)
Expand All @@ -672,9 +640,8 @@ def testNode2IndexMethods(self):

view = QgsLayerTreeView()
view.setModel(self.model)
if USE_MODEL_TESTER:
proxy_tester = QAbstractItemModelTester(view.model())
tree_tester = QAbstractItemModelTester(view.layerTreeModel())
proxy_tester = QAbstractItemModelTester(view.model())
tree_tester = QAbstractItemModelTester(view.layerTreeModel())

tree_model = view.layerTreeModel()
proxy_model = view.proxyModel()
Expand Down
9 changes: 1 addition & 8 deletions tests/src/python/test_qgssymbollayer.py
View file
Expand Up @@ -23,11 +23,9 @@
__copyright__ = '(C) 2012, Massimo Endrighi'

import os
from distutils.version import StrictVersion

import qgis # NOQA
from osgeo import ogr
from qgis.PyQt.Qt import PYQT_VERSION_STR
from qgis.PyQt.QtCore import Qt, QObject, QDir, QFile, QIODevice, QPointF, QSize, QTemporaryDir
from qgis.PyQt.QtGui import QColor, QImage, QPainter
from qgis.PyQt.QtXml import QDomDocument
Expand Down Expand Up @@ -75,7 +73,6 @@
QgsRendererCategory,
)
from qgis.testing import start_app, unittest

from utilities import unitTestDataPath

# Convenience instances in case you may need them
Expand All @@ -84,11 +81,7 @@

TEST_DATA_DIR = unitTestDataPath()

if StrictVersion(PYQT_VERSION_STR) < StrictVersion('5.7'):
from qgis.PyQt.QtCore import pyqtWrapperType
EXPECTED_TYPE = pyqtWrapperType
else:
EXPECTED_TYPE = type(QObject)
EXPECTED_TYPE = type(QObject)


class TestQgsSymbolLayer(unittest.TestCase):
Expand Down

0 comments on commit 28bd021

Please sign in to comment.