Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Carlos Cordoba <ccordoba12@gmail.com>
  • Loading branch information
dalthviz and ccordoba12 authored Aug 25, 2023
1 parent 9085d33 commit 8dfe793
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
26 changes: 22 additions & 4 deletions .github/workflows/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand All @@ -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
Expand Down

0 comments on commit 8dfe793

Please sign in to comment.