Commit389b45f

committed

Pin all Qt bindings for minimum version CI

1 parentf0cd8de commit389b45fCopy full SHA for 389b45f

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,9 @@ jobs:`
`37`	`37`	`python-version:3.8`
`38`	`38`	`extra-requirements:'-c requirements/testing/minver.txt'`
`39`	`39`	`pyqt5-ver:'==5.11.2 sip==5.0.0'# oldest versions with a Py3.8 wheel.`
	`40`	`+pyqt6-ver:'==6.1.0 PyQt6-Qt6==6.1.0'`
	`41`	`+pyside2-ver:'==5.11.2'`
	`42`	`+pyside6-ver:'==6.0.0'`
`40`	`43`	`delete-font-cache:true`
`41`	`44`	`-os:ubuntu-20.04`
`42`	`45`	`python-version:3.8`
`@@ -189,17 +192,17 @@ jobs:`
`189`	`192`	`echo 'PyQt5 is available' \|\|`
`190`	`193`	`echo 'PyQt5 is not available'`
`191`	`194`	`if [[ "${{ runner.os }}" != 'macOS' ]]; then`
`192`		`- python -mpip install --upgrade pyside2 &&`
	`195`	`+ python -mpip install --upgrade pyside2${{ matrix.pyside2-ver }} &&`
`193`	`196`	`python -c 'import PySide2.QtCore' &&`
`194`	`197`	`echo 'PySide2 is available' \|\|`
`195`	`198`	`echo 'PySide2 is not available'`
`196`	`199`	`fi`
`197`	`200`	`if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then`
`198`		`- python -mpip install --upgrade pyqt6 &&`
	`201`	`+ python -mpip install --upgrade pyqt6${{ matrix.pyqt6-ver }} &&`
`199`	`202`	`python -c 'import PyQt6.QtCore' &&`
`200`	`203`	`echo 'PyQt6 is available' \|\|`
`201`	`204`	`echo 'PyQt6 is not available'`
`202`		`- python -mpip install --upgrade pyside6 &&`
	`205`	`+ python -mpip install --upgrade pyside6${{ matrix.pyside6-ver }} &&`
`203`	`206`	`python -c 'import PySide6.QtCore' &&`
`204`	`207`	`echo 'PySide6 is available' \|\|`
`205`	`208`	`echo 'PySide6 is not available'`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,10 @@ def _isdeleted(obj): return not shiboken6.isValid(obj)`
`92`	`92`	`_isdeleted=sip.isdeleted`
`93`	`93`	`elifQT_API==QT_API_PYSIDE2:`
`94`	`94`	`fromPySide2importQtCore,QtGui,QtWidgets,__version__`
`95`		`-importshiboken2`
	`95`	`+try:`
	`96`	`+fromPySide2importshiboken2`
	`97`	`+exceptImportError:`
	`98`	`+importshiboken2`
`96`	`99`	`def_isdeleted(obj):`
`97`	`100`	`returnnotshiboken2.isValid(obj)`
`98`	`101`	`else:`

Comments

(0)