Merge pull request #463 from blurstudio-forks/mikeh/py_fixes

Fix py3.7 tests, add testing for Cy2026 and py3.12 and py3.14

Author: MHendricks

.github/actions/setup-tox/action.yml

@@ -41,14 +41,31 @@ runs:
       with:
         python-version: '3.11'
 
+    - name: Setup Python 3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - name: Setup Python 3.13
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+
+    - name: Setup Python 3.14
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.14'
+
     - name: Setup Python 3.10
       uses: actions/setup-python@v5
       with:
         python-version: '3.10'
 
     - name: Install dependencies
       shell: bash
+      # NOTE: The virtualenv and tox requirements support finding python 3.7,
+      # if we drop support for python 3.7 the reqs can be simplified and updated
       run: |
         python --version
         python -m pip install --upgrade pip
-        python -m pip install tox
+        python -m pip install "tox<=4.23.2" "virtualenv<=20.26.6"

.github/workflows/run-tox.yml

@@ -104,6 +104,14 @@ jobs:
           # Cy2024, Cy2025
           'test-py311-PySide6.5',
           'test-py311-PyQt6.5',
+          # Cy2026
+          'test-py313-PySide6.8',
+          'test-py313-PyQt6.8',
+          # Test newer versions of python/Qt than VFX Reference Platform has chosen
+          'test-py312-PySide6.8',
+          'test-py312-PyQt6.8',
+          'test-py314-PySide6.9',
+          'test-py314-PyQt6.9',
         ]
 
     env:

.hound.yml

@@ -5,7 +5,6 @@
 [![PyPI version](https://badge.fury.io/py/Qt.py.svg)](https://pypi.python.org/pypi/Qt.py)
 [![Anaconda-Server Badge](https://anaconda.org/conda-forge/qt.py/badges/version.svg)](https://anaconda.org/conda-forge/qt.py)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Qt-py/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 Qt.py enables you to write software that runs on any of the 4 supported bindings - PySide6, PyQt6, PySide2, PyQt5.
 

README.md

@@ -5,7 +5,7 @@
 import os
 import re
 import sys
-import imp
+import importlib.util
 import shutil
 import tempfile
 import textwrap
@@ -452,11 +452,15 @@ def test_environment():
 
     if sys.version_info >= (3, 11):
         # NOTE: Qt6 is only available for python 3.11 and above
-        imp.find_module("PySide6")
-        imp.find_module("PyQt6")
+        if importlib.util.find_spec("PySide6") is None:
+            raise ImportError("No module named 'PySide6'")
+        if importlib.util.find_spec("PyQt6") is None:
+            raise ImportError("No module named 'PyQt6'")
     else:
-        imp.find_module("PySide2")
-        imp.find_module("PyQt5")
+        if importlib.util.find_spec("PySide2") is None:
+            raise ImportError("No module named 'PySide2'")
+        if importlib.util.find_spec("PyQt5") is None:
+            raise ImportError("No module named 'PyQt5'")
 
 
 def test_load_ui_returntype():
@@ -1194,7 +1198,10 @@ def test_cli():
     )
 
     out, err = popen.communicate()
-    assert out.startswith(b"usage: Qt.py"), "\n%s" % out.decode()
+    # Py 3.14 seems to add color codes by default, strip them out for the test
+    # Source - https://stackoverflow.com/a/14693789
+    out = re.sub(rb"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])", b"", out)
+    assert b"usage: Qt.py" in out, "\n%s" % out.decode()
 
 
 def test_membership():

tests.py

@@ -23,8 +23,8 @@ envlist =
     # Combinations of python and Qt versions that should work
     ; membership-py37-PySide{5.12,5.15}
     ; membership-py{38,39,310}-PySide{5.15}
-    ; membership-py{39,310,311,312}-PySide{6.5,6.6}
-    ; membership-py{39,310,311,312}-{PySide,PyQt}{6.7,6.8,6.9}
+    ; membership-py{39,310,311,312,313,314}-PySide{6.5,6.6}
+    ; membership-py{39,310,311,312,313,314}-{PySide,PyQt}{6.7,6.8,6.9,6.10}
     # Generate common members from the previous tests generated files
     membership-end
 
@@ -44,7 +44,10 @@ envlist =
     # Cy2024, Cy2025
     test-py311-{PySide,PyQt}6.5-{impl,caveats,examples}
     # Cy2026
-    ; test-py313-{PySide,PyQt}6.8
+    test-py313-{PySide,PyQt}6.8
+    # Test newer versions of python/Qt than VFX Reference Platform has chosen
+    test-py{312}-{PySide,PyQt}{6.8}-{impl,caveats,examples}
+    test-py{314}-{PySide,PyQt}{6.9}-{impl,caveats,examples}
 
     # Standardize formatting and check for code quality issues
     check
@@ -76,14 +79,14 @@ setenv =
 commands =
     python membership.py --clean
 
-[testenv:membership-py{37,38,39,310,311,312,313}-{PySide,PyQt}{5.12,5.13,5.15,6.5,6.6,6.7,6.8,6.9}]
+[testenv:membership-py{37,38,39,310,311,312,313,314}-{PySide,PyQt}{5.12,5.13,5.15,6.5,6.6,6.7,6.8,6.9,6.10}]
 depends = membership-begin
 setenv =
     {[testenv]setenv}
     PySide{5.12,5.13,5.15}: BINDING=PySide2
-    PySide{6.5,6.6,6.7,6.8,6.9}: BINDING=PySide6
+    PySide{6.5,6.6,6.7,6.8,6.9,6.10}: BINDING=PySide6
     PyQt{5.12,5.13,5.15}: BINDING=PyQt5
-    PyQt{6.5,6.6,6.7,6.8,6.9}: BINDING=PyQt6
+    PyQt{6.5,6.6,6.7,6.8,6.9,6.10}: BINDING=PyQt6
 deps =
     PyQt5.12: PyQt5==5.12.*
     PyQt5.13: PyQt5==5.13.*
@@ -101,14 +104,13 @@ deps =
     PySide6.6: PySide6==6.6.*
     PySide6.7: PySide6==6.7.*
     PySide6.8: PySide6==6.8.*
-    PySide6.9: PySide6==6.9.*
 commands =
     # Build the membership for the requested Qt binding
     python membership.py --binding {env:BINDING}
 
 [testenv:membership-end]
 # Combine the .json files generated by previous tests into the common member files.
-depends = membership-py{37,38,39,310,311,312,313}-{PySide,PyQt}{5.12,5.13,5.15,6.5,6.6,6.7,6.8,6.9}
+depends = membership-py{37,38,39,310,311,312,313,314}-{PySide,PyQt}{5.12,5.13,5.15,6.5,6.6,6.7,6.8,6.9,6.10}
 commands =
     python membership.py --generate-common-members
 
@@ -121,7 +123,7 @@ commands =
     # doesn't get changed while another process is trying to read it.
     python -u build_caveats.py
 
-[testenv:test-py{37,38,39,310,311,312,313}-{PySide,PyQt}{5.12,5.13,5.15,6.5,6.6,6.7,6.8,6.9}-{impl,caveats,examples}]
+[testenv:test-py{37,38,39,310,311,312,313,314}-{PySide,PyQt}{5.12,5.13,5.15,6.5,6.6,6.7,6.8,6.9,6.10}-{impl,caveats,examples}]
 # Run nose tests for each requirement
 # We need Qt.py to be installed for nose tests
 skip_install = False
@@ -136,9 +138,9 @@ setenv =
     {[testenv]setenv}
     QT_VERBOSE=1
     PySide{5.12,5.13,5.15}: QT_PREFERRED_BINDING=PySide2
-    PySide{6.5,6.6,6.7,6.8,6.9}: QT_PREFERRED_BINDING=PySide6
+    PySide{6.5,6.6,6.7,6.8,6.9,6.10}: QT_PREFERRED_BINDING=PySide6
     PyQt{5.12,5.13,5.15}: QT_PREFERRED_BINDING=PyQt5
-    PyQt{6.5,6.6,6.7,6.8,6.9}: QT_PREFERRED_BINDING=PyQt6
+    PyQt{6.5,6.6,6.7,6.8,6.9,6.10}: QT_PREFERRED_BINDING=PyQt6
     # These are required for py37 to prevent errors caused by newer versions
     py37: VIRTUALENV_PIP==24.0
     py37: VIRTUALENV_SETUPTOOLS==44.1.1
@@ -163,8 +165,9 @@ deps =
     {PySide,PyQt}6.7: PySide6==6.7.*
     {PySide,PyQt}6.8: PyQt6==6.8.*
     {PySide,PyQt}6.8: PySide6==6.8.*
-    {PySide,PyQt}6.9: PyQt6==6.9.*
-    {PySide,PyQt}6.9: PySide6==6.9.*
+    # Note: PyQt6==6.10.* doesn't support QAxContainer and PySide6 didn't compile 6.9
+    {PySide,PyQt}{6.9,6.10}: PyQt6==6.9.*
+    {PySide,PyQt}{6.9,6.10}: PySide6==6.10.*
 
     nose2
     nosepipe