PR: Update Qt6 binding versions to check version 6.8, add Python 3.13, use macos-15-intel and drop Python 3.7 and 3.8 (CI) (#523)

dalthviz · web-flow · commit 8c32a24a872f · 2025-11-17T16:22:20.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,54 +43,67 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13]
-        python-version: ['3.7', '3.11']
+        os: [ubuntu-latest, windows-latest, macos-15-intel]
+        python-version: ['3.9', '3.11', '3.13']
         use-conda: ['Yes', 'No']
         qt5-version-default: ['5.12']
-        qt6-version-default: ['6.3']
+        qt6-version-default: ['6.5']
         qscintilla-version-default: ['2.13']
         pyqt-extras-default: ['No']
         include:
         - os: ubuntu-latest
           special-invocation: 'xvfb-run --auto-servernum '  # Needed for GUI tests to work
+        - python-version: '3.13'
+          pyqt5-version: '5.15'
+          skip-pyside2: true  # Unavailable for Python 3.13+
+          pyqt6-version: '6.8'
+          pyside6-version: '6.8'
         - python-version: '3.11'
           pyqt5-version: '5.15'  # Python 3.11 needs 5.15+
           pyside2-version: '5.15'  # Python 3.11 needs 5.15+
-          pyside6-version: '6.5'  # Python 3.11 needs 6.4+. Test upper bound
+          pyside6-version: '6.8'  # Python 3.11 needs 6.4+. Test upper bound
         - use-conda: 'Yes'
-          skip-pyqt6: true  # No PyQt6 conda packages yet
+          skip-pyqt6: true  # PyQt6 conda packages only available from anaconda channel
         - use-conda: 'No'
           pyqt5-version: '5.15'  # Test with latest optional packages
-        - python-version: '3.7'
+        - python-version: '3.9'
           use-conda: 'Yes'
           pyside2-version: '5.13'  # Conda needs 5.13+ to work reliably
           pyside2-qt-version: '5.12'  # Conda only has 5.12 and 5.15, not 5.13
-          pyside6-version: '6.4'  # Conda only has 6.4 for Python <3.8
         - python-version: '3.11'
           use-conda: 'No'
           pyqt-extras: 'Yes'  # Check PyQt extras
           skip-pyside2: true  # Pyside2 wheels don't support Python 3.11+
-          pyqt6-version: '6.5'  # Test upper bound
-          pyside6-version: '6.5'  # Test upper bound
+          pyqt6-version: '6.8'  # Test upper bound
+          pyside6-version: '6.8'  # Test upper bound
         - os: windows-latest
-          python-version: '3.7'
-          use-conda: 'Yes'
-          pyqt5-version: '5.9'  # Test lower bound
-          skip-pyside6: true  # Test hangs with 6.4. 6.5 is not available for Python 3.7
-        - os: windows-latest
-          python-version: '3.7'
+          python-version: '3.9'
           use-conda: 'No'
           pyqt6-version: 6.2  # Test lower bound
           pyside6-version: 6.2  # Test lower bound
+          pyside2-version: 5.15 # Version 5.12 not available
         - os: windows-latest
           python-version: '3.11'
           use-conda: 'Yes'
-          pyside6-version: 6.5  # Test upper bound
-        - os: macos-13
+          pyside6-version: 6.8  # Test upper bound
+        - os: macos-15-intel
           python-version: '3.11'
           use-conda: 'No'
-          pyqt6-version: 6.5  # Test upper bound
+          pyqt6-version: 6.8  # Test upper bound
           pyside2-version: 5.15  # Test upper bound
+        - os: macos-15-intel
+          python-version: '3.9'
+          use-conda: 'No'
+          pyqt6-version: 6.2  # Test lower bound
+          pyside6-version: 6.2  # Test lower bound
+        - os: macos-15-intel
+          python-version: '3.9'
+          use-conda: 'Yes'
+          pyside6-version: 6.8  # Test upper bound. Gets stuck with 6.5
+        exclude:
+        - os: macos-15-intel
+          python-version: '3.11'
+          use-conda: 'Yes'
     steps:
       - name: Check job values
         run: |
diff --git a/.github/workflows/test.sh b/.github/workflows/test.sh
@@ -26,6 +26,9 @@ if [ "$USE_CONDA" = "Yes" ]; then
         QT_SPECS="qt=${PYSIDE2_QT_VERSION} pyside2=${PYSIDE2_VERSION}"
     elif [ "${1}" = "pyside6" ]; then
         QT_SPECS="qt6-main=${PYSIDE6_QT_VERSION} pyside6=${PYSIDE6_VERSION}"
+        if [ "${!QT_VERSION_VAR:0:3}" = "6.8" ]; then
+            QT_SPECS+=" qt6-multimedia=${PYSIDE6_QT_VERSION}"
+        fi
     else
         exit 1
     fi
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -30,7 +30,7 @@ repos:
     rev: v2.5.0
     hooks:
     - id: setup-cfg-fmt
-      args: ["--include-version-classifiers", "--max-py-version", "3.11", "--min-py-version", "3.7"]
+      args: ["--include-version-classifiers", "--max-py-version", "3.13", "--min-py-version", "3.9"]
 
 ci:
     autoupdate_schedule: monthly
diff --git a/README.md b/README.md
@@ -177,26 +177,26 @@ checking feature while using QtPy in your source code.
 ## Testing matrix
 
 Currently, QtPy runs tests for different bindings on Linux, Windows and macOS, using
-Python 3.7 and 3.11, and installing those bindings with `conda` and `pip`. For the
+Python 3.9, 3.11 and 3.13, and installing those bindings with `conda` and `pip`. For the
 PyQt bindings, we also check the installation of extra packages via `pip`.
 
 Following this, the current test matrix looks something like this:
 
-|         | Python          | 3.7                                        |      | 3.11               |                            |
-|---------|-----------------|--------------------------------------------|------|--------------------|----------------------------|
-| OS      | Binding / manager | conda                                      | pip  | conda              | pip                        |
-| Linux   | PyQt5           | 5.12                                       | 5.15 | 5.15               | 5.15 (with extras)         |
-|         | PyQt6           | skip (unavailable)                         | 6.3  | skip (unavailable) | 6.5 (with extras)          |
-|         | PySide2         | 5.13                                       | 5.12 | 5.15               | skip (no wheels available) |
-|         | PySide6         | 6.4                                        | 6.3  | 6.5                | 6.5                        |
-| Windows | PyQt5           | 5.9                                        | 5.15 | 5.15               | 5.15 (with extras)         |
-|         | PyQt6           | skip (unavailable)                         | 6.2  | skip (unavailable) | 6.5 (with extras)          |
-|         | PySide2         | 5.13                                       | 5.12 | 5.15               | skip (no wheels available) |
-|         | PySide6         | skip (test hang with 6.4. 6.5 unavailable) | 6.2  | 6.5                | 6.5                        |
-| MacOS   | PyQt5           | 5.12                                       | 5.15 | 5.15               | 5.15 (with extras)         |
-|         | PyQt6           | skip (unavailable)                         | 6.3  | skip (unavailable) | 6.5 (with extras)          |
-|         | PySide2         | 5.13                                       | 5.12 | 5.15               | skip (no wheels available) |
-|         | PySide6         | 6.4                                        | 6.3  | 6.5                | 6.5                        |
+|         | Python          | 3.9                |      | 3.11               |                            | 3.13               |                            |
+|---------|-----------------|--------------------|------|--------------------|----------------------------|--------------------|----------------------------|
+| OS      | Binding / manager | conda              | pip  | conda              | pip                        | conda              | pip                        |
+| Linux   | PyQt5           | 5.12               | 5.15 | 5.15               | 5.15 (with extras)         | 5.15               | 5.15                       |
+|         | PyQt6           | skip (unavailable) | 6.5  | skip (unavailable) | 6.8 (with extras)          | skip (unavailable) | 6.8                        |
+|         | PySide2         | 5.13               | 5.12 | 5.15               | skip (no wheels available) | skip (unavailable) | skip (no wheels available) |
+|         | PySide6         | 6.5                | 6.5  | 6.8                | 6.8                        | 6.8                | 6.8                        |
+| Windows | PyQt5           | 5.12               | 5.15 | 5.15               | 5.15 (with extras)         | 5.15               | 5.15                       |
+|         | PyQt6           | skip (unavailable) | 6.2  | skip (unavailable) | 6.8 (with extras)          | skip (unavailable) | 6.8                        |
+|         | PySide2         | 5.13               | 5.15 | 5.15               | skip (no wheels available) | skip (unavailable) | skip (no wheels available) |
+|         | PySide6         | 6.5                | 6.2  | 6.8                | 6.8                        | 6.8                | 6.8                        |
+| MacOS   | PyQt5           | 5.12               | 5.15 | skip               | 5.15 (with extras)         | 5.15               | 5.15                       |
+|         | PyQt6           | skip (unavailable) | 6.2  | skip               | 6.8 (with extras)          | skip (unavailable) | 6.8                        |
+|         | PySide2         | 5.13               | 5.12 | skip               | skip (no wheels available) | skip (unavailable) | skip (no wheels available) |
+|         | PySide6         | 6.8                | 6.2  | skip               | 6.8                        | 6.8                | 6.8                        |
 
 **Note**: The mentioned extra packages for the PyQt bindings are the following:
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 
 [tool.black]
-target-version = ['py37', 'py38', 'py39', 'py310', 'py311']
+target-version = ['py39', 'py310', 'py311', 'py312']
 skip-string-normalization = true
 line-length = 79
 exclude = '''
@@ -88,7 +88,7 @@ exclude = [
     "*_vendor*",
 ]
 
-target-version = "py37"
+target-version = "py39"
 fix = true
 
 
diff --git a/qtpy/tests/test_qtgui.py b/qtpy/tests/test_qtgui.py
@@ -15,7 +15,6 @@
     QtGui,
     QtWidgets,
 )
-from qtpy.tests.utils import not_using_conda
 
 
 def test_qfontmetrics_width(qtbot):
@@ -27,8 +26,8 @@ def test_qfontmetrics_width(qtbot):
     font_metricsF = QtGui.QFontMetricsF(font)
     width = font_metrics.width("Test")
     widthF = font_metricsF.width("Test")
-    assert width in range(40, 62)
-    assert 39 <= widthF <= 63
+    assert width in range(39, 62)
+    assert 38 <= widthF <= 63
 
 
 def test_qdrag_functions(qtbot):
diff --git a/qtpy/tests/test_uic.py b/qtpy/tests/test_uic.py
@@ -78,6 +78,11 @@ def test_load_ui_type(qtbot):
             category=DeprecationWarning,
             message=".*mode.*",
         )
+        warnings.filterwarnings(
+            "ignore",
+            category=ResourceWarning,
+            message=".*mode.*",
+        )  # Needed for PySide2 5.13
         ui_type, ui_base_type = uic.loadUiType(
             os.path.join(os.path.dirname(__file__), "test.ui"),
         )
diff --git a/setup.cfg b/setup.cfg
@@ -23,11 +23,11 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.13
     Topic :: Software Development :: Libraries
     Topic :: Software Development :: User Interfaces
     Topic :: Software Development :: Widget Sets
@@ -41,7 +41,7 @@ project_urls =
 packages = find:
 install_requires =
     packaging
-python_requires = >=3.7
+python_requires = >=3.9
 include_package_data = True
 zip_safe = False
 

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,11 @@ def test_load_ui_type(qtbot):`
`78`	`78`	`category=DeprecationWarning,`
`79`	`79`	`message=".mode.",`
`80`	`80`	`)`
	`81`	`+ warnings.filterwarnings(`
	`82`	`+ "ignore",`
	`83`	`+ category=ResourceWarning,`
	`84`	`+ message=".mode.",`
	`85`	`+ ) # Needed for PySide2 5.13`
`81`	`86`	`ui_type, ui_base_type = uic.loadUiType(`
`82`	`87`	`os.path.join(os.path.dirname(__file__), "test.ui"),`
`83`	`88`	`)`