Set default value to check PyQt extra packages to 'No'. Change QScintilla testing for PyQt6

dalthviz · dalthviz · commit ddbff451c106 · 2023-08-23T17:11:09.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,14 +49,15 @@ jobs:
         qt5-version-default: ['5.12']
         qt6-version-default: ['6.3']
         qscintilla-version-default: ['2.13']
-        pyqt-extras-default: ['Yes']
+        pyqt-extras-default: ['No']
         include:
         - os: ubuntu-latest
           special-invocation: 'xvfb-run --auto-servernum '  # Needed for GUI tests to work
         - 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.4'  # Python 3.11 needs 6.4+
+          pyside6-version: '6.5'  # Python 3.11 needs 6.4+. Test upper bound
+          pyqt-extras: 'Yes'  # Check PyQt extras
         - use-conda: 'Yes'
           skip-pyqt6: true  # No PyQt6 conda packages yet
           pyside6-version: '6.4'  # Conda only has 6.4+ for Python <3.8
@@ -87,6 +88,7 @@ jobs:
         - os: macos-latest
           python-version: '3.7'
           use-conda: 'No'
+          pyqt-extras: 'Yes'  # Check PyQt extras
           pyqt6-version: 6.5  # Test upper bound
           pyside2-version: 5.15  # Test upper bound
     steps:
diff --git a/.github/workflows/test.sh b/.github/workflows/test.sh
@@ -44,9 +44,9 @@ if [ "$USE_CONDA" = "No" ]; then
     elif [ "${1}" = "pyqt6" ]; then
 
         if [ "$PYQT_EXTRAS" = "Yes" ]; then
-            pip install pyqt6==${PYQT6_VERSION}.* PyQt6-WebEngine==${PYQT6_VERSION}.* PyQt6-Qt6==${PYQT6_QT_VERSION}.* PyQt6-QScintilla==${QSCINTILLA_VERSION}.* PyQt6-3D==${PYQT6_VERSION}.* PyQt6-Charts==${PYQT6_VERSION}.* PyQt6-DataVisualization==${PYQT6_VERSION}.* PyQt6-NetworkAuth==${PYQT6_VERSION}.*
+            pip install pyqt6==${PYQT6_VERSION}.* PyQt6-WebEngine==${PYQT6_VERSION}.* PyQt6-Qt6==${PYQT6_QT_VERSION}.* PyQt6-QScintilla PyQt6-3D==${PYQT6_VERSION}.* PyQt6-Charts==${PYQT6_VERSION}.* PyQt6-DataVisualization==${PYQT6_VERSION}.* PyQt6-NetworkAuth==${PYQT6_VERSION}.*
         else
-            pip install pyqt6==${PYQT6_VERSION}.* PyQt6-WebEngine==${PYQT6_VERSION}.* PyQt6-Qt6==${PYQT6_QT_VERSION}.* PyQt6-QScintilla==${QSCINTILLA_VERSION}.*
+            pip install pyqt6==${PYQT6_VERSION}.* PyQt6-WebEngine==${PYQT6_VERSION}.* PyQt6-Qt6==${PYQT6_QT_VERSION}.*
         fi
 
     elif [ "${1}" = "pyside2" ]; then
