Commit1d9d0ed

committed

Don't fail Qt tests if bindings not installed.

1 parenteb39be5 commit1d9d0edCopy full SHA for 1d9d0ed

File tree

+18

-7

lines changed

+18

-7

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,18 @@`
`7`	`7`
`8`	`8`	`importpytest`
`9`	`9`
`10`		`-withmatplotlib.rc_context(rc={'backend':'Qt4Agg'}):`
`11`		`-qt_compat=pytest.importorskip('matplotlib.backends.qt_compat')`
	`10`	`+try:`
	`11`	`+importPyQt4`
	`12`	`+except (ImportError,RuntimeError):# RuntimeError if PyQt5 already imported.`
	`13`	`+try:`
	`14`	`+importPySide`
	`15`	`+exceptImportError:`
	`16`	`+pytestmark=pytest.mark.skip("Failed to import a Qt4 binding.")`
	`17`	`+`
	`18`	`+frommatplotlib.backends.qt_compatimportQtCore`
`12`	`19`	`frommatplotlib.backends.backend_qt4import (`
`13`	`20`	`MODIFIER_KEYS,SUPER,ALT,CTRL,SHIFT)# noqa`
`14`	`21`
`15`		`-QtCore=qt_compat.QtCore`
`16`	`22`	`_,ControlModifier,ControlKey=MODIFIER_KEYS[CTRL]`
`17`	`23`	`_,AltModifier,AltKey=MODIFIER_KEYS[ALT]`
`18`	`24`	`_,SuperModifier,SuperKey=MODIFIER_KEYS[SUPER]`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,18 @@`
`7`	`7`
`8`	`8`	`importpytest`
`9`	`9`
`10`		`-withmatplotlib.rc_context(rc={'backend':'Qt5Agg'}):`
`11`		`-qt_compat=pytest.importorskip('matplotlib.backends.qt_compat',`
`12`		`-minversion='5')`
	`10`	`+try:`
	`11`	`+importPyQt5`
	`12`	`+except (ImportError,RuntimeError):# RuntimeError if PyQt4 already imported.`
	`13`	`+try:`
	`14`	`+importPySide2`
	`15`	`+exceptImportError:`
	`16`	`+pytestmark=pytest.mark.skip("Failed to import a Qt5 binding.")`
	`17`	`+`
	`18`	`+frommatplotlib.backends.qt_compatimportQtCore`
`13`	`19`	`frommatplotlib.backends.backend_qt5import (`
`14`	`20`	`MODIFIER_KEYS,SUPER,ALT,CTRL,SHIFT)# noqa`
`15`	`21`
`16`		`-QtCore=qt_compat.QtCore`
`17`	`22`	`_,ControlModifier,ControlKey=MODIFIER_KEYS[CTRL]`
`18`	`23`	`_,AltModifier,AltKey=MODIFIER_KEYS[ALT]`
`19`	`24`	`_,SuperModifier,SuperKey=MODIFIER_KEYS[SUPER]`

Comments

(0)