Hello community, here is the log from the commit of package python-QtPy for openSUSE:Factory checked in at 2019-07-29 17:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-QtPy (Old) and /work/SRC/openSUSE:Factory/.python-QtPy.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-QtPy" Mon Jul 29 17:31:27 2019 rev:11 rq:719516 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-QtPy/python-QtPy.changes 2019-07-23 22:42:37.542777433 +0200 +++ /work/SRC/openSUSE:Factory/.python-QtPy.new.4126/python-QtPy.changes 2019-07-29 17:31:29.042165541 +0200 @@ -1,0 +2,15 @@ +Mon Jul 29 07:57:44 UTC 2019 - pgajdos@suse.com + +- version update to 1.9.0 + * Add the FORCE_QT_API environment variable to keep using the Qt + bindings selected with the QT_API variable and avoid switching + to the currently imported bindings. This allows to have + applications that import PySide and PyQt bindings at the same + time (which is possible if both bindings are compiled for the + same Qt version). + * Errors in the Qt3D modules with PySide2 5.12.4+ and Python 2 + * Binding Selection Logic + * PR: Don't load Qt3D modules for buggy versions of PySide2 + * PR: Add FORCE_QT_API environment variable + +------------------------------------------------------------------- Old: ---- QtPy-1.8.0.tar.gz New: ---- QtPy-1.9.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-QtPy.spec ++++++ --- /var/tmp/diff_new_pack.B80R2V/_old 2019-07-29 17:31:29.550164927 +0200 +++ /var/tmp/diff_new_pack.B80R2V/_new 2019-07-29 17:31:29.554164922 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-QtPy -Version: 1.8.0 +Version: 1.9.0 Release: 0 Summary: Abstraction layer on top of Qt bindings License: MIT ++++++ QtPy-1.8.0.tar.gz -> QtPy-1.9.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/CHANGELOG.md new/QtPy-1.9.0/CHANGELOG.md --- old/QtPy-1.8.0/CHANGELOG.md 2019-05-05 09:51:49.000000000 +0200 +++ new/QtPy-1.9.0/CHANGELOG.md 2019-07-23 12:17:21.000000000 +0200 @@ -1,5 +1,56 @@ # History of changes +## Version 1.9.0 (2019-07-23) + +### New features + +* Add the FORCE_QT_API environment variable to keep using the Qt + bindings selected with the QT_API variable and avoid switching + to the currently imported bindings. This allows to have + applications that import PySide and PyQt bindings at the same + time (which is possible if both bindings are compiled for the + same Qt version). + +### Issues Closed + +* [Issue 195](https://github.com/spyder-ide/qtpy/issues/195) - Errors in the Qt3D modules with PySide2 5.12.4+ and Python 2 ([PR 196](https://github.com/spyder-ide/qtpy/pull/196)) +* [Issue 192](https://github.com/spyder-ide/qtpy/issues/192) - Binding Selection Logic ([PR 194](https://github.com/spyder-ide/qtpy/pull/194)) + +In this release 2 issues were closed. + +### Pull Requests Merged + +* [PR 196](https://github.com/spyder-ide/qtpy/pull/196) - PR: Don't load Qt3D modules for buggy versions of PySide2 ([195](https://github.com/spyder-ide/qtpy/issues/195)) +* [PR 194](https://github.com/spyder-ide/qtpy/pull/194) - PR: Add FORCE_QT_API environment variable ([192](https://github.com/spyder-ide/qtpy/issues/192)) + +In this release 2 pull requests were closed. + + +---- + + +## Version 1.8.0 (2019-06-12) + +### New features + +* Add support for several Qt 3D modules. + +### Issues Closed + +* [Issue 172](https://github.com/spyder-ide/qtpy/issues/172) - Support for Qt3D ([PR 191](https://github.com/spyder-ide/qtpy/pull/191)) + +In this release 1 issue was closed. + +### Pull Requests Merged + +* [PR 191](https://github.com/spyder-ide/qtpy/pull/191) - PR: Add Qt 3D bindings ([172](https://github.com/spyder-ide/qtpy/issues/172)) + +In this release 1 pull request was closed. + + +---- + + ## Version 1.7.1 (2019-05-05) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/PKG-INFO new/QtPy-1.9.0/PKG-INFO --- old/QtPy-1.8.0/PKG-INFO 2019-06-12 13:18:26.000000000 +0200 +++ new/QtPy-1.9.0/PKG-INFO 2019-07-23 12:19:34.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: QtPy -Version: 1.8.0 +Version: 1.9.0 Summary: Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets. Home-page: https://github.com/spyder-ide/qtpy Author: Colin Duquesnoy, The Spyder Development Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/QtPy.egg-info/PKG-INFO new/QtPy-1.9.0/QtPy.egg-info/PKG-INFO --- old/QtPy-1.8.0/QtPy.egg-info/PKG-INFO 2019-06-12 13:18:25.000000000 +0200 +++ new/QtPy-1.9.0/QtPy.egg-info/PKG-INFO 2019-07-23 12:19:34.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: QtPy -Version: 1.8.0 +Version: 1.9.0 Summary: Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets. Home-page: https://github.com/spyder-ide/qtpy Author: Colin Duquesnoy, The Spyder Development Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/qtpy/Qt3DAnimation.py new/QtPy-1.9.0/qtpy/Qt3DAnimation.py --- old/QtPy-1.8.0/qtpy/Qt3DAnimation.py 2019-06-12 13:16:09.000000000 +0200 +++ new/QtPy-1.9.0/qtpy/Qt3DAnimation.py 2019-07-15 10:09:31.000000000 +0200 @@ -8,15 +8,19 @@ """Provides Qt3DAnimation classes and functions.""" # Local imports -from . import PYQT5, PYSIDE2, PythonQtError +from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION +from .py3compat import PY2 if PYQT5: from PyQt5.Qt3DAnimation import * elif PYSIDE2: - # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 - import PySide2.Qt3DAnimation as __temp - import inspect - for __name in inspect.getmembers(__temp.Qt3DAnimation): - globals()[__name[0]] = __name[1] + if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'): + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 + import PySide2.Qt3DAnimation as __temp + import inspect + for __name in inspect.getmembers(__temp.Qt3DAnimation): + globals()[__name[0]] = __name[1] + else: + raise PythonQtError('A bug in Shiboken prevents this') else: raise PythonQtError('No Qt bindings could be found') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/qtpy/Qt3DCore.py new/QtPy-1.9.0/qtpy/Qt3DCore.py --- old/QtPy-1.8.0/qtpy/Qt3DCore.py 2019-06-12 13:16:09.000000000 +0200 +++ new/QtPy-1.9.0/qtpy/Qt3DCore.py 2019-07-15 10:09:31.000000000 +0200 @@ -8,15 +8,19 @@ """Provides Qt3DCore classes and functions.""" # Local imports -from . import PYQT5, PYSIDE2, PythonQtError +from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION +from .py3compat import PY2 if PYQT5: from PyQt5.Qt3DCore import * elif PYSIDE2: - # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 - import PySide2.Qt3DCore as __temp - import inspect - for __name in inspect.getmembers(__temp.Qt3DCore): - globals()[__name[0]] = __name[1] + if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'): + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 + import PySide2.Qt3DCore as __temp + import inspect + for __name in inspect.getmembers(__temp.Qt3DCore): + globals()[__name[0]] = __name[1] + else: + raise PythonQtError('A bug in Shiboken prevents this') else: raise PythonQtError('No Qt bindings could be found') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/qtpy/Qt3DExtras.py new/QtPy-1.9.0/qtpy/Qt3DExtras.py --- old/QtPy-1.8.0/qtpy/Qt3DExtras.py 2019-06-12 13:16:09.000000000 +0200 +++ new/QtPy-1.9.0/qtpy/Qt3DExtras.py 2019-07-15 10:09:31.000000000 +0200 @@ -8,15 +8,19 @@ """Provides Qt3DExtras classes and functions.""" # Local imports -from . import PYQT5, PYSIDE2, PythonQtError +from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION +from .py3compat import PY2 if PYQT5: from PyQt5.Qt3DExtras import * elif PYSIDE2: - # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 - import PySide2.Qt3DExtras as __temp - import inspect - for __name in inspect.getmembers(__temp.Qt3DExtras): - globals()[__name[0]] = __name[1] + if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'): + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 + import PySide2.Qt3DExtras as __temp + import inspect + for __name in inspect.getmembers(__temp.Qt3DExtras): + globals()[__name[0]] = __name[1] + else: + raise PythonQtError('A bug in Shiboken prevents this') else: raise PythonQtError('No Qt bindings could be found') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/qtpy/Qt3DInput.py new/QtPy-1.9.0/qtpy/Qt3DInput.py --- old/QtPy-1.8.0/qtpy/Qt3DInput.py 2019-06-12 13:16:09.000000000 +0200 +++ new/QtPy-1.9.0/qtpy/Qt3DInput.py 2019-07-15 10:09:31.000000000 +0200 @@ -8,15 +8,19 @@ """Provides Qt3DInput classes and functions.""" # Local imports -from . import PYQT5, PYSIDE2, PythonQtError +from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION +from .py3compat import PY2 if PYQT5: from PyQt5.Qt3DInput import * elif PYSIDE2: - # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 - import PySide2.Qt3DInput as __temp - import inspect - for __name in inspect.getmembers(__temp.Qt3DInput): - globals()[__name[0]] = __name[1] + if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'): + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 + import PySide2.Qt3DInput as __temp + import inspect + for __name in inspect.getmembers(__temp.Qt3DInput): + globals()[__name[0]] = __name[1] + else: + raise PythonQtError('A bug in Shiboken prevents this') else: raise PythonQtError('No Qt bindings could be found') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/qtpy/Qt3DLogic.py new/QtPy-1.9.0/qtpy/Qt3DLogic.py --- old/QtPy-1.8.0/qtpy/Qt3DLogic.py 2019-06-12 13:16:09.000000000 +0200 +++ new/QtPy-1.9.0/qtpy/Qt3DLogic.py 2019-07-15 10:09:31.000000000 +0200 @@ -8,15 +8,19 @@ """Provides Qt3DLogic classes and functions.""" # Local imports -from . import PYQT5, PYSIDE2, PythonQtError +from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION +from .py3compat import PY2 if PYQT5: from PyQt5.Qt3DLogic import * elif PYSIDE2: - # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 - import PySide2.Qt3DLogic as __temp - import inspect - for __name in inspect.getmembers(__temp.Qt3DLogic): - globals()[__name[0]] = __name[1] + if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'): + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 + import PySide2.Qt3DLogic as __temp + import inspect + for __name in inspect.getmembers(__temp.Qt3DLogic): + globals()[__name[0]] = __name[1] + else: + raise PythonQtError('A bug in Shiboken prevents this') else: raise PythonQtError('No Qt bindings could be found') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/qtpy/Qt3DRender.py new/QtPy-1.9.0/qtpy/Qt3DRender.py --- old/QtPy-1.8.0/qtpy/Qt3DRender.py 2019-06-12 13:16:09.000000000 +0200 +++ new/QtPy-1.9.0/qtpy/Qt3DRender.py 2019-07-15 10:09:31.000000000 +0200 @@ -8,15 +8,19 @@ """Provides Qt3DRender classes and functions.""" # Local imports -from . import PYQT5, PYSIDE2, PythonQtError +from . import PYQT5, PYSIDE2, PythonQtError, PYSIDE_VERSION +from .py3compat import PY2 if PYQT5: from PyQt5.Qt3DRender import * elif PYSIDE2: - # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 - import PySide2.Qt3DRender as __temp - import inspect - for __name in inspect.getmembers(__temp.Qt3DRender): - globals()[__name[0]] = __name[1] + if not PY2 or (PY2 and PYSIDE_VERSION < '5.12.4'): + # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026 + import PySide2.Qt3DRender as __temp + import inspect + for __name in inspect.getmembers(__temp.Qt3DRender): + globals()[__name[0]] = __name[1] + else: + raise PythonQtError('A bug in Shiboken prevents this') else: raise PythonQtError('No Qt bindings could be found') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/qtpy/__init__.py new/QtPy-1.9.0/qtpy/__init__.py --- old/QtPy-1.8.0/qtpy/__init__.py 2019-03-05 11:44:01.000000000 +0100 +++ new/QtPy-1.9.0/qtpy/__init__.py 2019-07-23 12:08:14.000000000 +0200 @@ -114,15 +114,17 @@ PYQT5 = True PYQT4 = PYSIDE = PYSIDE2 = False - -if 'PyQt5' in sys.modules: - API = initial_api if initial_api in PYQT5_API else 'pyqt5' -elif 'PySide2' in sys.modules: - API = initial_api if initial_api in PYSIDE2_API else 'pyside2' -elif 'PyQt4' in sys.modules: - API = initial_api if initial_api in PYQT4_API else 'pyqt4' -elif 'PySide' in sys.modules: - API = initial_api if initial_api in PYSIDE_API else 'pyside' +# When `FORCE_QT_API` is set, we disregard +# any previously imported python bindings. +if os.environ.get('FORCE_QT_API') is not None: + if 'PyQt5' in sys.modules: + API = initial_api if initial_api in PYQT5_API else 'pyqt5' + elif 'PySide2' in sys.modules: + API = initial_api if initial_api in PYSIDE2_API else 'pyside2' + elif 'PyQt4' in sys.modules: + API = initial_api if initial_api in PYQT4_API else 'pyqt4' + elif 'PySide' in sys.modules: + API = initial_api if initial_api in PYSIDE_API else 'pyside' if API in PYQT5_API: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPy-1.8.0/qtpy/_version.py new/QtPy-1.9.0/qtpy/_version.py --- old/QtPy-1.8.0/qtpy/_version.py 2019-06-12 13:17:28.000000000 +0200 +++ new/QtPy-1.9.0/qtpy/_version.py 2019-07-23 12:18:53.000000000 +0200 @@ -1,2 +1,2 @@ -version_info = (1, 8, 0) +version_info = (1, 9, 0) __version__ = '.'.join(map(str, version_info))