diff options
| author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
|---|---|---|
| committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
| commit | c49572a2e90b398e90a43f86b490f27ee6c58de6 (patch) | |
| tree | d130cf7dfc3cf73157e1bece8173331bb4bc7156 /silx/app/test_.py | |
| parent | 0bbc8ab933e62c1fa6d548e879ae6d98cbd461f1 (diff) | |
| parent | cebdc9244c019224846cb8d2668080fe386a6adc (diff) | |
Merge tag 'upstream/0.9.0+dfsg'
Upstream version 0.9.0+dfsg
Diffstat (limited to 'silx/app/test_.py')
| -rw-r--r-- | silx/app/test_.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/silx/app/test_.py b/silx/app/test_.py index 2623c04..a8e58bf 100644 --- a/silx/app/test_.py +++ b/silx/app/test_.py @@ -1,6 +1,6 @@ # coding: utf-8 # /*########################################################################## -# Copyright (C) 2016 European Synchrotron Radiation Facility +# Copyright (C) 2016-2018 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -99,7 +99,7 @@ def main(argv): "INFO messages. Use -vv for full verbosity, " + "including debug messages and test help strings.") parser.add_argument("--qt-binding", dest="qt_binding", default=None, - help="Force using a Qt binding, from 'PyQt4', 'PyQt5', or 'PySide'") + help="Force using a Qt binding: 'PyQt5' or 'PySide2'") utils.test_options.add_parser_argument(parser) options = parser.parse_args(argv[1:]) @@ -128,6 +128,9 @@ def main(argv): elif binding == "pyside": _logger.info("Force using PySide") import PySide.QtCore # noqa + elif binding == "pyside2": + _logger.info("Force using PySide2") + import PySide2.QtCore # noqa else: raise ValueError("Qt binding '%s' is unknown" % options.qt_binding) |