Merge branch 'master' into PR-Add-QtCore.Qt.MouseButton.MidButton-alias-for-Qt6

dalthviz · web-flow · commit d66572d7dff9 · 2024-10-24T14:35:40.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-13]
         python-version: ['3.7', '3.11']
         use-conda: ['Yes', 'No']
         qt5-version-default: ['5.12']
@@ -86,7 +86,7 @@ jobs:
           python-version: '3.11'
           use-conda: 'Yes'
           pyside6-version: 6.5  # Test upper bound
-        - os: macos-latest
+        - os: macos-13
           python-version: '3.11'
           use-conda: 'No'
           pyqt6-version: 6.5  # Test upper bound
diff --git a/README.md b/README.md
@@ -218,7 +218,7 @@ Everyone is welcome to contribute! See our [Contributing guide](CONTRIBUTING.md)
 QtPy is funded thanks to the generous support of
 
 
-[![Quansight](https://user-images.githubusercontent.com/16781833/142477716-53152d43-99a0-470c-a70b-c04bbfa97dd4.png)](https://www.quansight.com/)[![Numfocus](https://i2.wp.com/numfocus.org/wp-content/uploads/2017/07/NumFocus_LRG.png?fit=320%2C148&ssl=1)](https://numfocus.org/)
+[![Chan Zuckerberg Initiative](https://raw.githubusercontent.com/spyder-ide/spyder/master/img_src/czi.png)](https://chanzuckerberg.com/)[![Numfocus](https://i2.wp.com/numfocus.org/wp-content/uploads/2017/07/NumFocus_LRG.png?fit=320%2C148&ssl=1)](https://numfocus.org/)
 
 and the donations we have received from our users around the world through [Open Collective](https://opencollective.com/spyder/):
 
diff --git a/pytest.ini b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts = --durations=10 -v -r a --color=yes --code-highlight=yes --strict-config --strict-markers --maxfail 10 --cov-report=term-missing
+addopts = --durations=10 -v -r a --color=yes --code-highlight=yes --strict-config --strict-markers --maxfail 10 --cov-report=term-missing --cov-report=xml
 empty_parameter_set_mark = fail_at_collect
 filterwarnings =
     error
diff --git a/qtpy/__init__.py b/qtpy/__init__.py
@@ -278,6 +278,12 @@ def __init__(self, *, missing_package=None, **superclass_kwargs):
 if API in PYSIDE6_API:
     try:
         from PySide6 import __version__ as PYSIDE_VERSION  # analysis:ignore
+
+        if PYSIDE_VERSION == "6.8.0":
+            print(
+                "A known critical bug in PySide6 6.8.0 will cause your application to crash. "
+                "See https://github.com/spyder-ide/qtpy/issues/494",
+            )
         from PySide6.QtCore import __version__ as QT_VERSION  # analysis:ignore
 
         QT5 = PYQT5 = False
diff --git a/qtpy/tests/test_main.py b/qtpy/tests/test_main.py
@@ -6,6 +6,7 @@
 import pytest
 
 from qtpy import API_NAMES, QtCore, QtGui, QtWidgets
+from qtpy.tests.utils import pytest_importorskip
 
 with contextlib.suppress(Exception):
     # removed in qt 6.0
@@ -112,7 +113,7 @@ def test_qt_api_environ(api):
     If no QT_API is specified but some Qt is imported, ensure QT_API is set properly.
     """
     mod = f"{api}.QtCore"
-    pytest.importorskip(mod, reason=f"Requires {api}")
+    pytest_importorskip(mod, reason=f"Requires {api}")
     # clean env
     env = os.environ.copy()
     for key in ("QT_API", "USE_QT_API"):
diff --git a/qtpy/tests/test_qsci.py b/qtpy/tests/test_qsci.py
@@ -3,7 +3,7 @@
 import pytest
 
 from qtpy import PYSIDE2, PYSIDE6
-from qtpy.tests.utils import using_conda
+from qtpy.tests.utils import pytest_importorskip, using_conda
 
 
 @pytest.mark.skipif(
@@ -12,7 +12,7 @@
 )
 def test_qsci():
     """Test the qtpy.Qsci namespace"""
-    Qsci = pytest.importorskip("qtpy.Qsci")
+    Qsci = pytest_importorskip("qtpy.Qsci")
     assert Qsci.QSCINTILLA_VERSION is not None
     assert Qsci.QSCINTILLA_VERSION_STR is not None
     assert Qsci.QsciAPIs is not None
diff --git a/qtpy/tests/test_qt3danimation.py b/qtpy/tests/test_qt3danimation.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qt3danimation():
     """Test the qtpy.Qt3DAnimation namespace"""
-    Qt3DAnimation = pytest.importorskip("qtpy.Qt3DAnimation")
+    Qt3DAnimation = pytest_importorskip("qtpy.Qt3DAnimation")
 
     assert Qt3DAnimation.QAnimationController is not None
     assert Qt3DAnimation.QAdditiveClipBlend is not None
diff --git a/qtpy/tests/test_qt3dcore.py b/qtpy/tests/test_qt3dcore.py
@@ -1,13 +1,14 @@
 import pytest
 
 from qtpy import PYQT6, PYSIDE6
+from qtpy.tests.utils import pytest_importorskip
 
 
 @pytest.mark.skipif(PYQT6, reason="Not complete in PyQt6")
 @pytest.mark.skipif(PYSIDE6, reason="Not complete in PySide6")
 def test_qt3dcore():
     """Test the qtpy.Qt3DCore namespace"""
-    Qt3DCore = pytest.importorskip("qtpy.Qt3DCore")
+    Qt3DCore = pytest_importorskip("qtpy.Qt3DCore")
 
     assert Qt3DCore.QPropertyValueAddedChange is not None
     assert Qt3DCore.QSkeletonLoader is not None
diff --git a/qtpy/tests/test_qt3dextras.py b/qtpy/tests/test_qt3dextras.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qt3dextras():
     """Test the qtpy.Qt3DExtras namespace"""
-    Qt3DExtras = pytest.importorskip("qtpy.Qt3DExtras")
+    Qt3DExtras = pytest_importorskip("qtpy.Qt3DExtras")
 
     assert Qt3DExtras.QTextureMaterial is not None
     assert Qt3DExtras.QPhongAlphaMaterial is not None
diff --git a/qtpy/tests/test_qt3dinput.py b/qtpy/tests/test_qt3dinput.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qt3dinput():
     """Test the qtpy.Qt3DInput namespace"""
-    Qt3DInput = pytest.importorskip("qtpy.Qt3DInput")
+    Qt3DInput = pytest_importorskip("qtpy.Qt3DInput")
 
     assert Qt3DInput.QAxisAccumulator is not None
     assert Qt3DInput.QInputSettings is not None
diff --git a/qtpy/tests/test_qt3dlogic.py b/qtpy/tests/test_qt3dlogic.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qt3dlogic():
     """Test the qtpy.Qt3DLogic namespace"""
-    Qt3DLogic = pytest.importorskip("qtpy.Qt3DLogic")
+    Qt3DLogic = pytest_importorskip("qtpy.Qt3DLogic")
 
     assert Qt3DLogic.QLogicAspect is not None
     assert Qt3DLogic.QFrameAction is not None
diff --git a/qtpy/tests/test_qt3drender.py b/qtpy/tests/test_qt3drender.py
@@ -1,13 +1,14 @@
 import pytest
 
 from qtpy import PYQT6, PYSIDE6
+from qtpy.tests.utils import pytest_importorskip
 
 
 @pytest.mark.skipif(PYQT6, reason="Not complete in PyQt6")
 @pytest.mark.skipif(PYSIDE6, reason="Not complete in PySide6")
 def test_qt3drender():
     """Test the qtpy.Qt3DRender namespace"""
-    Qt3DRender = pytest.importorskip("qtpy.Qt3DRender")
+    Qt3DRender = pytest_importorskip("qtpy.Qt3DRender")
 
     assert Qt3DRender.QPointSize is not None
     assert Qt3DRender.QFrustumCulling is not None
diff --git a/qtpy/tests/test_qtaxcontainer.py b/qtpy/tests/test_qtaxcontainer.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtaxcontainer():
     """Test the qtpy.QtAxContainer namespace"""
-    QtAxContainer = pytest.importorskip("qtpy.QtAxContainer")
+    QtAxContainer = pytest_importorskip("qtpy.QtAxContainer")
 
     assert QtAxContainer.QAxSelect is not None
     assert QtAxContainer.QAxWidget is not None
diff --git a/qtpy/tests/test_qtbluetooth.py b/qtpy/tests/test_qtbluetooth.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtbluetooth():
     """Test the qtpy.QtBluetooth namespace"""
-    QtBluetooth = pytest.importorskip("qtpy.QtBluetooth")
+    QtBluetooth = pytest_importorskip("qtpy.QtBluetooth")
 
     assert QtBluetooth.QBluetooth is not None
     assert QtBluetooth.QBluetoothDeviceInfo is not None
diff --git a/qtpy/tests/test_qtcharts.py b/qtpy/tests/test_qtcharts.py
@@ -1,6 +1,7 @@
 import pytest
 
 from qtpy import PYSIDE2, PYSIDE6
+from qtpy.tests.utils import pytest_importorskip
 
 
 @pytest.mark.skipif(
@@ -9,7 +10,7 @@
 )
 def test_qtcharts():
     """Test the qtpy.QtCharts namespace"""
-    QtCharts = pytest.importorskip("qtpy.QtCharts")
+    QtCharts = pytest_importorskip("qtpy.QtCharts")
 
     assert QtCharts.QChart is not None
     assert QtCharts.QtCharts.QChart is not None
diff --git a/qtpy/tests/test_qtconcurrent.py b/qtpy/tests/test_qtconcurrent.py
@@ -2,11 +2,12 @@
 from packaging.version import parse
 
 from qtpy import PYSIDE2, PYSIDE_VERSION
+from qtpy.tests.utils import pytest_importorskip
 
 
 def test_qtconcurrent():
     """Test the qtpy.QtConcurrent namespace"""
-    QtConcurrent = pytest.importorskip("qtpy.QtConcurrent")
+    QtConcurrent = pytest_importorskip("qtpy.QtConcurrent")
 
     assert QtConcurrent.QtConcurrent is not None
 
diff --git a/qtpy/tests/test_qtdatavisualization.py b/qtpy/tests/test_qtdatavisualization.py
@@ -1,5 +1,7 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtdatavisualization():
     """Test the qtpy.QtDataVisualization namespace"""
@@ -8,7 +10,7 @@ def test_qtdatavisualization():
     # For example in the case of `PyQt5` you need `PyQtDataVisualization`
 
     # QtDataVisualization
-    QtDataVisualization = pytest.importorskip("qtpy.QtDataVisualization")
+    QtDataVisualization = pytest_importorskip("qtpy.QtDataVisualization")
     assert QtDataVisualization.QScatter3DSeries is not None
     assert QtDataVisualization.QSurfaceDataItem is not None
     assert QtDataVisualization.QSurface3DSeries is not None
@@ -47,7 +49,7 @@ def test_qtdatavisualization():
 
     # QtDatavisualization
     # import qtpy to get alias for `QtDataVisualization` with lower `v`
-    qtpy = pytest.importorskip("qtpy")
+    qtpy = pytest_importorskip("qtpy")
 
     assert qtpy.QtDatavisualization.QScatter3DSeries is not None
     assert qtpy.QtDatavisualization.QSurfaceDataItem is not None
diff --git a/qtpy/tests/test_qtdbus.py b/qtpy/tests/test_qtdbus.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtdbus():
     """Test the qtpy.QtDBus namespace"""
-    QtDBus = pytest.importorskip("qtpy.QtDBus")
+    QtDBus = pytest_importorskip("qtpy.QtDBus")
 
     assert QtDBus.QDBusAbstractAdaptor is not None
     assert QtDBus.QDBusAbstractInterface is not None
diff --git a/qtpy/tests/test_qtdesigner.py b/qtpy/tests/test_qtdesigner.py
@@ -1,12 +1,13 @@
 import pytest
 
 from qtpy import PYSIDE2
+from qtpy.tests.utils import pytest_importorskip
 
 
 @pytest.mark.skipif(PYSIDE2, reason="QtDesigner is not available in PySide2")
 def test_qtdesigner():
     """Test the qtpy.QtDesigner namespace."""
-    QtDesigner = pytest.importorskip("qtpy.QtDesigner")
+    QtDesigner = pytest_importorskip("qtpy.QtDesigner")
 
     assert QtDesigner.QAbstractExtensionFactory is not None
     assert QtDesigner.QAbstractExtensionManager is not None
diff --git a/qtpy/tests/test_qtmacextras.py b/qtpy/tests/test_qtmacextras.py
@@ -3,7 +3,7 @@
 import pytest
 
 from qtpy import PYQT6, PYSIDE6
-from qtpy.tests.utils import using_conda
+from qtpy.tests.utils import pytest_importorskip, using_conda
 
 
 @pytest.mark.skipif(
@@ -16,7 +16,7 @@
 )
 def test_qtmacextras():
     """Test the qtpy.QtMacExtras namespace"""
-    QtMacExtras = pytest.importorskip("qtpy.QtMacExtras")
+    QtMacExtras = pytest_importorskip("qtpy.QtMacExtras")
 
     assert QtMacExtras.QMacPasteboardMime is not None
     assert QtMacExtras.QMacToolBar is not None
diff --git a/qtpy/tests/test_qtnetworkauth.py b/qtpy/tests/test_qtnetworkauth.py
@@ -1,12 +1,13 @@
 import pytest
 
 from qtpy import PYQT5, PYQT6, PYSIDE2
+from qtpy.tests.utils import pytest_importorskip
 
 
 @pytest.mark.skipif(PYSIDE2, reason="Not available for PySide2")
 def test_qtnetworkauth():
     """Test the qtpy.QtNetworkAuth namespace"""
-    QtNetworkAuth = pytest.importorskip("qtpy.QtNetworkAuth")
+    QtNetworkAuth = pytest_importorskip("qtpy.QtNetworkAuth")
 
     assert QtNetworkAuth.QAbstractOAuth is not None
     assert QtNetworkAuth.QAbstractOAuth2 is not None
diff --git a/qtpy/tests/test_qtpdf.py b/qtpy/tests/test_qtpdf.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtpdf():
     """Test the qtpy.QtPdf namespace"""
-    QtPdf = pytest.importorskip("qtpy.QtPdf")
+    QtPdf = pytest_importorskip("qtpy.QtPdf")
 
     assert QtPdf.QPdfDocument is not None
     assert QtPdf.QPdfLink is not None
diff --git a/qtpy/tests/test_qtpdfwidgets.py b/qtpy/tests/test_qtpdfwidgets.py
@@ -1,8 +1,10 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtpdfwidgets():
     """Test the qtpy.QtPdfWidgets namespace"""
-    QtPdfWidgets = pytest.importorskip("qtpy.QtPdfWidgets")
+    QtPdfWidgets = pytest_importorskip("qtpy.QtPdfWidgets")
 
     assert QtPdfWidgets.QPdfView is not None
diff --git a/qtpy/tests/test_qtpurchasing.py b/qtpy/tests/test_qtpurchasing.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtpurchasing():
     """Test the qtpy.QtPurchasing namespace"""
-    QtPurchasing = pytest.importorskip("qtpy.QtPurchasing")
+    QtPurchasing = pytest_importorskip("qtpy.QtPurchasing")
 
     assert QtPurchasing.QInAppProduct is not None
     assert QtPurchasing.QInAppStore is not None
diff --git a/qtpy/tests/test_qtquick3d.py b/qtpy/tests/test_qtquick3d.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtquick3d():
     """Test the qtpy.QtQuick3D namespace"""
-    QtQuick3D = pytest.importorskip("qtpy.QtQuick3D")
+    QtQuick3D = pytest_importorskip("qtpy.QtQuick3D")
 
     assert QtQuick3D.QQuick3D is not None
     assert QtQuick3D.QQuick3DGeometry is not None
diff --git a/qtpy/tests/test_qtquickcontrols2.py b/qtpy/tests/test_qtquickcontrols2.py
@@ -1,8 +1,10 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtquickcontrols2():
     """Test the qtpy.QtQuickControls2 namespace"""
-    QtQuickControls2 = pytest.importorskip("qtpy.QtQuickControls2")
+    QtQuickControls2 = pytest_importorskip("qtpy.QtQuickControls2")
 
     assert QtQuickControls2.QQuickStyle is not None
diff --git a/qtpy/tests/test_qtremoteobjects.py b/qtpy/tests/test_qtremoteobjects.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtremoteobjects():
     """Test the qtpy.QtRemoteObjects namespace"""
-    QtRemoteObjects = pytest.importorskip("qtpy.QtRemoteObjects")
+    QtRemoteObjects = pytest_importorskip("qtpy.QtRemoteObjects")
 
     assert QtRemoteObjects.QRemoteObjectAbstractPersistedStore is not None
     assert QtRemoteObjects.QRemoteObjectDynamicReplica is not None
diff --git a/qtpy/tests/test_qtscxml.py b/qtpy/tests/test_qtscxml.py
@@ -1,9 +1,11 @@
 import pytest
 
+from qtpy.tests.utils import pytest_importorskip
+
 
 def test_qtscxml():
     """Test the qtpy.QtScxml namespace"""
-    QtScxml = pytest.importorskip("qtpy.QtScxml")
+    QtScxml = pytest_importorskip("qtpy.QtScxml")
 
     assert QtScxml.QScxmlCompiler is not None
     assert QtScxml.QScxmlDynamicScxmlServiceFactory is not None
diff --git a/qtpy/tests/test_qtstatemachine.py b/qtpy/tests/test_qtstatemachine.py
diff --git a/qtpy/tests/test_qtsvgwidgets.py b/qtpy/tests/test_qtsvgwidgets.py
diff --git a/qtpy/tests/test_qtuitools.py b/qtpy/tests/test_qtuitools.py
diff --git a/qtpy/tests/test_qtwebenginecore.py b/qtpy/tests/test_qtwebenginecore.py
diff --git a/qtpy/tests/test_qtwebenginequick.py b/qtpy/tests/test_qtwebenginequick.py
diff --git a/qtpy/tests/test_qtwebenginewidgets.py b/qtpy/tests/test_qtwebenginewidgets.py
diff --git a/qtpy/tests/test_qtx11extras.py b/qtpy/tests/test_qtx11extras.py
diff --git a/qtpy/tests/test_shiboken.py b/qtpy/tests/test_shiboken.py
diff --git a/qtpy/tests/test_sip.py b/qtpy/tests/test_sip.py
diff --git a/qtpy/tests/test_uic.py b/qtpy/tests/test_uic.py
diff --git a/qtpy/tests/utils.py b/qtpy/tests/utils.py
