Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

include PySide in qt4agg backend check #3387

Merged
merged 2 commits into from Oct 17, 2014
Merged

include PySide in qt4agg backend check #3387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0863d30
include PySide in qt4agg backend check
jbmohler Aug 19, 2014
27e3bd2
always include response from both PySide & PyQt4
jbmohler Oct 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -93,7 +93,6 @@
setupext.BackendMacOSX(),
setupext.BackendQt5(),
setupext.BackendQt4(),
setupext.BackendPySide(),
setupext.BackendGtk3Agg(),
setupext.BackendGtk3Cairo(),
setupext.BackendGtkAgg(),
Expand Down
50 changes: 28 additions & 22 deletions setupext.py
View file
Open in desktop
Expand Up @@ -1958,7 +1958,18 @@ def check_requirements(self):
return msg


def backend_qt4_internal_check(self):
def backend_pyside_internal_check(self):
try:
from PySide import __version__
from PySide import QtCore
except ImportError:
raise CheckFailed("PySide not found")
else:
BackendAgg.force = True
return ("Qt: %s, PySide: %s" %
(QtCore.__version__, __version__))

def backend_pyqt4_internal_check(self):
try:
from PyQt4 import QtCore
except ImportError:
Expand All @@ -1973,6 +1984,22 @@ def backend_qt4_internal_check(self):
BackendAgg.force = True
return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))

def backend_qt4_internal_check(self):
successes = []
failures = []
try:
successes.append(backend_pyside_internal_check(self))
except CheckFailed as e:
failures.append(str(e))

try:
successes.append(backend_pyqt4_internal_check(self))
except CheckFailed as e:
failures.append(str(e))

if len(successes) == 0:
raise CheckFailed('; '.join(failures))
return '; '.join(successes+failures)

class BackendQt4(BackendQtBase):
name = "qt4agg"
Expand Down Expand Up @@ -2006,27 +2033,6 @@ def __init__(self, *args, **kwargs):
self.callback = backend_qt5_internal_check


def backend_pyside_internal_check(self):
try:
from PySide import __version__
from PySide import QtCore
except ImportError:
raise CheckFailed("PySide not found")
else:
BackendAgg.force = True
return ("Qt: %s, PySide: %s" %
(QtCore.__version__, __version__))


class BackendPySide(BackendQtBase):
name = "pyside"

def __init__(self, *args, **kwargs):
BackendQtBase.__init__(self, *args, **kwargs)
self.callback = backend_pyside_internal_check



class BackendCairo(OptionalBackendPackage):
name = "cairo"

Expand Down