Use qtpy, deprecate superqt.qtcompat, drop support for Qt <5.12

.github/workflows/test_and_deploy.yml

@@ -75,12 +75,6 @@ jobs:
             backend: pyqt5
 
           # legacy Qt
-          - python-version: 3.7
-            platform: ubuntu-latest
-            backend: pyside511
-          - python-version: 3.7
-            platform: ubuntu-latest
-            backend: pyqt511
           - python-version: 3.7
             platform: ubuntu-latest
             backend: pyqt512

CONTRIBUTING.md

@@ -31,8 +31,6 @@ All widgets must be well-tested, and should work on:
 - PySide2 (5.11 and above) & PySide6
 - macOS, Windows, & Linux
 
-Until [qtpy](https://github.com/spyder-ide/qtpy) supports PyQt6/PySide6, imports
-should use (and modify if necessary) `superqt.qtcompat`.
 
 ## Style Guide
 

codecov.yml

@@ -1,6 +1,5 @@
 ignore:
   - superqt/_version.py
-  - superqt/qtcompat/*
   - '*_tests*'
 coverage:
   status:

docs/decorators.md

@@ -16,7 +16,7 @@ an instance of
 To block and wait for the result, see [Synchronous mode](#synchronous-mode)
 
 ```python
-from superqt.qtcompat.QtCore import QObject
+from qtpy.QtCore import QObject
 from superqt import ensure_main_thread, ensure_object_thread
 
 @ensure_main_thread

examples/basic.py

@@ -1,6 +1,7 @@
+from qtpy.QtCore import Qt
+from qtpy.QtWidgets import QApplication
+
 from superqt import QRangeSlider
-from superqt.qtcompat.QtCore import Qt
-from superqt.qtcompat.QtWidgets import QApplication
 
 app = QApplication([])
 

examples/basic_float.py

@@ -1,6 +1,7 @@
+from qtpy.QtCore import Qt
+from qtpy.QtWidgets import QApplication
+
 from superqt import QDoubleSlider
-from superqt.qtcompat.QtCore import Qt
-from superqt.qtcompat.QtWidgets import QApplication
 
 app = QApplication([])
 

examples/collapsible.py

@@ -1,6 +1,7 @@
 """Example for QCollapsible"""
+from qtpy.QtWidgets import QApplication, QLabel, QPushButton
+
 from superqt import QCollapsible
-from superqt.qtcompat.QtWidgets import QApplication, QLabel, QPushButton
 
 app = QApplication([])
 

examples/demo_widget.py

@@ -1,6 +1,7 @@
+from qtpy import QtCore
+from qtpy import QtWidgets as QtW
+
 from superqt import QRangeSlider
-from superqt.qtcompat import QtCore
-from superqt.qtcompat import QtWidgets as QtW
 
 QSS = """
 QSlider {

examples/eliding_label.py

@@ -1,5 +1,6 @@
+from qtpy.QtWidgets import QApplication
+
 from superqt import QElidingLabel
-from superqt.qtcompat.QtWidgets import QApplication
 
 app = QApplication([])
 

examples/float.py

@@ -1,6 +1,7 @@
+from qtpy.QtCore import Qt
+from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
+
 from superqt import QDoubleRangeSlider, QDoubleSlider, QRangeSlider
-from superqt.qtcompat.QtCore import Qt
-from superqt.qtcompat.QtWidgets import QApplication, QVBoxLayout, QWidget
 
 app = QApplication([])
 

examples/fonticon1.py

@@ -6,9 +6,10 @@
         "pip install git+https://github.com/tlambert03/fonticon-fontawesome5.git"
     )
 
+from qtpy.QtCore import QSize
+from qtpy.QtWidgets import QApplication, QPushButton
+
 from superqt.fonticon import icon, pulse
-from superqt.qtcompat.QtCore import QSize
-from superqt.qtcompat.QtWidgets import QApplication, QPushButton
 
 app = QApplication([])
 

examples/fonticon2.py

@@ -6,8 +6,9 @@
         "pip install git+https://github.com/tlambert03/fonticon-fontawesome5.git"
     )
 
+from qtpy.QtWidgets import QApplication, QPushButton
+
 from superqt.fonticon import setTextIcon
-from superqt.qtcompat.QtWidgets import QApplication, QPushButton
 
 app = QApplication([])
 

examples/fonticon3.py

@@ -6,9 +6,10 @@
         "pip install git+https://github.com/tlambert03/fonticon-fontawesome5.git"
     )
 
+from qtpy.QtCore import QSize
+from qtpy.QtWidgets import QApplication, QPushButton
+
 from superqt.fonticon import IconOpts, icon, pulse, spin
-from superqt.qtcompat.QtCore import QSize
-from superqt.qtcompat.QtWidgets import QApplication, QPushButton
 
 app = QApplication([])
 

examples/generic.py

@@ -1,6 +1,7 @@
+from qtpy.QtCore import Qt
+from qtpy.QtWidgets import QApplication
+
 from superqt import QDoubleSlider
-from superqt.qtcompat.QtCore import Qt
-from superqt.qtcompat.QtWidgets import QApplication
 
 app = QApplication([])
 

examples/icon_explorer.py

@@ -1,6 +1,7 @@
+from qtpy import QtCore, QtGui, QtWidgets
+from qtpy.QtCore import Qt
+
 from superqt.fonticon._plugins import loaded
-from superqt.qtcompat import QtCore, QtGui, QtWidgets
-from superqt.qtcompat.QtCore import Qt
 
 P = loaded(load_all=True)
 if not P:

examples/labeled.py

@@ -1,11 +1,12 @@
+from qtpy.QtCore import Qt
+from qtpy.QtWidgets import QApplication, QHBoxLayout, QVBoxLayout, QWidget
+
 from superqt import (
     QLabeledDoubleRangeSlider,
     QLabeledDoubleSlider,
     QLabeledRangeSlider,
     QLabeledSlider,
 )
-from superqt.qtcompat.QtCore import Qt
-from superqt.qtcompat.QtWidgets import QApplication, QHBoxLayout, QVBoxLayout, QWidget
 
 app = QApplication([])
 

examples/multihandle.py

@@ -1,5 +1,6 @@
+from qtpy.QtWidgets import QApplication
+
 from superqt import QRangeSlider
-from superqt.qtcompat.QtWidgets import QApplication
 
 app = QApplication([])
 

setup.cfg

@@ -35,6 +35,7 @@ project_urls =
 [options]
 packages = find:
 install_requires =
+    qtpy
     typing-extensions>=3.10.0.0
 python_requires = >=3.7
 include_package_data = True
@@ -86,11 +87,6 @@ superqt = py.typed
 exclude = _version.py,.eggs,examples
 docstring-convention = numpy
 ignore = E203,W503,E501,C901,F403,F405,D100
-per-file-ignores =
-    src/superqt/qtcompat/QtCore.py:F401
-    src/superqt/qtcompat/QtGui.py:F401
-    src/superqt/qtcompat/QtWidgets.py:F401
-    src/superqt/qtcompat/__init__.py:F401,F811
 
 [pydocstyle]
 convention = numpy

src/superqt/_eliding_label.py

@@ -1,8 +1,8 @@
 from typing import List
 
-from superqt.qtcompat.QtCore import QPoint, QRect, QSize, Qt
-from superqt.qtcompat.QtGui import QFont, QFontMetrics, QResizeEvent, QTextLayout
-from superqt.qtcompat.QtWidgets import QLabel
+from qtpy.QtCore import QPoint, QRect, QSize, Qt
+from qtpy.QtGui import QFont, QFontMetrics, QResizeEvent, QTextLayout
+from qtpy.QtWidgets import QLabel
 
 
 class QElidingLabel(QLabel):

src/superqt/collapsible/_collapsible.py

@@ -1,14 +1,14 @@
 """A collapsible widget to hide and unhide child widgets"""
 from typing import Optional
 
-from ..qtcompat.QtCore import (
+from qtpy.QtCore import (
     QAbstractAnimation,
     QEasingCurve,
     QMargins,
     QPropertyAnimation,
     Qt,
 )
-from ..qtcompat.QtWidgets import QFrame, QPushButton, QVBoxLayout, QWidget
+from qtpy.QtWidgets import QFrame, QPushButton, QVBoxLayout, QWidget
 
 
 class QCollapsible(QFrame):

src/superqt/combobox/_enum_combobox.py

@@ -1,8 +1,8 @@
 from enum import Enum, EnumMeta
 from typing import Optional, TypeVar
 
-from ..qtcompat.QtCore import Signal
-from ..qtcompat.QtWidgets import QComboBox
+from qtpy.QtCore import Signal
+from qtpy.QtWidgets import QComboBox
 
 EnumType = TypeVar("EnumType", bound=Enum)
 

src/superqt/fonticon/__init__.py

@@ -22,8 +22,8 @@
 from ._qfont_icon import QFontIconStore as _QFIS
 
 if TYPE_CHECKING:
-    from superqt.qtcompat.QtGui import QFont, QTransform
-    from superqt.qtcompat.QtWidgets import QWidget
+    from qtpy.QtGui import QFont, QTransform
+    from qtpy.QtWidgets import QWidget
 
     from ._qfont_icon import QFontIcon, ValidColor
 

src/superqt/fonticon/_animations.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
 
-from superqt.qtcompat.QtCore import QRectF, QTimer
-from superqt.qtcompat.QtGui import QPainter
-from superqt.qtcompat.QtWidgets import QWidget
+from qtpy.QtCore import QRectF, QTimer
+from qtpy.QtGui import QPainter
+from qtpy.QtWidgets import QWidget
 
 
 class Animation(ABC):

src/superqt/fonticon/_qfont_icon.py

@@ -6,11 +6,9 @@
 from pathlib import Path
 from typing import DefaultDict, Dict, Optional, Sequence, Tuple, Type, Union, cast
 
-from typing_extensions import TypedDict
-
-from ..qtcompat import QT_VERSION
-from ..qtcompat.QtCore import QObject, QPoint, QRect, QSize, Qt
-from ..qtcompat.QtGui import (
+from qtpy import QT_VERSION
+from qtpy.QtCore import QObject, QPoint, QRect, QSize, Qt
+from qtpy.QtGui import (
     QColor,
     QFont,
     QFontDatabase,
@@ -22,7 +20,9 @@
     QPixmapCache,
     QTransform,
 )
-from ..qtcompat.QtWidgets import QApplication, QStyleOption, QWidget
+from qtpy.QtWidgets import QApplication, QStyleOption, QWidget
+from typing_extensions import TypedDict
+
 from ..utils import QMessageHandler
 from ._animations import Animation