From 8dfe79309db556ac36244c5c27275dd4c311f9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Althviz=20Mor=C3=A9?= Date: Fri, 25 Aug 2023 16:49:10 -0500 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Carlos Cordoba --- .github/workflows/test.sh | 26 ++++++++++++++++++++++---- README.md | 4 ++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.sh b/.github/workflows/test.sh index b0d4b0bf..5e87543e 100755 --- a/.github/workflows/test.sh +++ b/.github/workflows/test.sh @@ -36,17 +36,35 @@ if [ "$USE_CONDA" = "No" ]; then if [ "${1}" = "pyqt5" ]; then if [ "$PYQT_EXTRAS" = "Yes" ]; then - pip install pyqt5==${PYQT5_VERSION}.* PyQtWebEngine==${PYQT5_VERSION}.* QScintilla==${QSCINTILLA_VERSION}.* PyQt3D==${PYQT5_VERSION}.* PyQtChart==${PYQT5_VERSION}.* PyQtDataVisualization==${PYQT5_VERSION}.* PyQtNetworkAuth==${PYQT5_VERSION}.* PyQtPurchasing==${PYQT5_VERSION}.* + pip install pyqt5==${PYQT5_VERSION}.* \ + PyQtWebEngine==${PYQT5_VERSION}.* \ + QScintilla==${QSCINTILLA_VERSION}.* \ + PyQt3D==${PYQT5_VERSION}.* \ + PyQtChart==${PYQT5_VERSION}.* \ + PyQtDataVisualization==${PYQT5_VERSION}.* \ + PyQtNetworkAuth==${PYQT5_VERSION}.* \ + PyQtPurchasing==${PYQT5_VERSION}.* else - pip install pyqt5==${PYQT5_VERSION}.* PyQtWebEngine==${PYQT5_VERSION}.* QScintilla==${QSCINTILLA_VERSION}.* + pip install pyqt5==${PYQT5_VERSION}.* \ + PyQtWebEngine==${PYQT5_VERSION}.* \ + QScintilla==${QSCINTILLA_VERSION}.* fi 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 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}.* + pip install pyqt6==${PYQT6_VERSION}.* \ + PyQt6-WebEngine==${PYQT6_VERSION}.* \ + PyQt6-Qt6==${PYQT6_QT_VERSION}.* fi elif [ "${1}" = "pyside2" ]; then diff --git a/README.md b/README.md index 33076fee..448623f8 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ Following this, the current test matrix looks something like this: | | Python | 3.7 | | 3.11 | | |---------|-----------------|--------------------------------------------|------|--------------------|----------------------------| -| OS | Binding\manager | conda | pip | conda | pip | +| 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) | @@ -205,7 +205,7 @@ Following this, the current test matrix looks something like this: ## Contributing -Everyone is welcome to contribute! See the [CONTRIBUTING guide](CONTRIBUTING.md) for more details. +Everyone is welcome to contribute! See our [Contributing guide](CONTRIBUTING.md) for more details. ## Sponsors