commit python3-jupyter_qtconsole for openSUSE:Factory
Hello community, here is the log from the commit of package python3-jupyter_qtconsole for openSUSE:Factory checked in at 2016-06-02 09:38:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-jupyter_qtconsole (Old) and /work/SRC/openSUSE:Factory/.python3-jupyter_qtconsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-jupyter_qtconsole" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-jupyter_qtconsole/python3-jupyter_qtconsole-doc.changes 2016-03-26 15:22:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-jupyter_qtconsole.new/python3-jupyter_qtconsole-doc.changes 2016-06-02 09:38:28.000000000 +0200 @@ -1,0 +2,13 @@ +Mon May 9 20:04:45 UTC 2016 - toddrme2178@gmail.com + +- Update to 4.2.1 + * Fix compatibility with some Qt bindings and traitlets ≥ 4.2. + +------------------------------------------------------------------- +Sun May 8 07:13:15 UTC 2016 - arun@gmx.de + +- specfile: + * updated source url to files.pythonhosted.org + + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3-jupyter_qtconsole/python3-jupyter_qtconsole.changes 2016-03-26 15:22:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-jupyter_qtconsole.new/python3-jupyter_qtconsole.changes 2016-06-02 09:38:28.000000000 +0200 @@ -1,0 +2,13 @@ +Mon May 9 20:04:45 UTC 2016 - toddrme2178@gmail.com + +- Update to 4.2.1 + * Fix compatibility with some Qt bindings and traitlets ≥ 4.2. + +------------------------------------------------------------------- +Sun May 8 07:13:13 UTC 2016 - arun@gmx.de + +- specfile: + * updated source url to files.pythonhosted.org + + +------------------------------------------------------------------- Old: ---- qtconsole-4.2.0.tar.gz New: ---- qtconsole-4.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-jupyter_qtconsole-doc.spec ++++++ --- /var/tmp/diff_new_pack.XAgQvQ/_old 2016-06-02 09:38:29.000000000 +0200 +++ /var/tmp/diff_new_pack.XAgQvQ/_new 2016-06-02 09:38:29.000000000 +0200 @@ -17,13 +17,15 @@ %if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) -%define build_pdf 1 +# PDF Documentation currently broken +# %define build_pdf 1 +%define build_pdf 0 %else %define build_pdf 0 %endif Name: python3-jupyter_qtconsole-doc -Version: 4.2.0 +Version: 4.2.1 Release: 0 Summary: Documentation for python3-jupyter_qtconsole License: BSD-3-Clause ++++++ python3-jupyter_qtconsole.spec ++++++ --- /var/tmp/diff_new_pack.XAgQvQ/_old 2016-06-02 09:38:29.000000000 +0200 +++ /var/tmp/diff_new_pack.XAgQvQ/_new 2016-06-02 09:38:29.000000000 +0200 @@ -17,13 +17,13 @@ Name: python3-jupyter_qtconsole -Version: 4.2.0 +Version: 4.2.1 Release: 0 Summary: Jupyter Qt console License: BSD-3-Clause Group: Development/Languages/Python Url: http://jupyter.org -Source: https://pypi.python.org/packages/source/q/qtconsole/qtconsole-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/q/qtconsole/qtconsole-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: hicolor-icon-theme BuildRequires: python3-Pygments ++++++ qtconsole-4.2.0.tar.gz -> qtconsole-4.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconsole-4.2.0/PKG-INFO new/qtconsole-4.2.1/PKG-INFO --- old/qtconsole-4.2.0/PKG-INFO 2016-02-23 09:02:11.000000000 +0100 +++ new/qtconsole-4.2.1/PKG-INFO 2016-03-30 18:36:56.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: qtconsole -Version: 4.2.0 +Version: 4.2.1 Summary: Jupyter Qt console Home-page: http://jupyter.org Author: Jupyter Development Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconsole-4.2.0/docs/source/changelog.rst new/qtconsole-4.2.1/docs/source/changelog.rst --- old/qtconsole-4.2.0/docs/source/changelog.rst 2016-02-23 09:00:10.000000000 +0100 +++ new/qtconsole-4.2.1/docs/source/changelog.rst 2016-03-30 18:14:33.000000000 +0200 @@ -5,6 +5,13 @@ .. _4.2: +4.2.1 +----- + +`4.2.1 on GitHub <https://github.com/jupyter/qtconsole/milestones/4.2.1>`__ + +Fix compatibility with some Qt bindings and traitlets ≥ 4.2. + 4.2 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconsole-4.2.0/qtconsole/_version.py new/qtconsole-4.2.1/qtconsole/_version.py --- old/qtconsole-4.2.0/qtconsole/_version.py 2016-02-23 09:01:47.000000000 +0100 +++ new/qtconsole-4.2.1/qtconsole/_version.py 2016-03-30 18:35:33.000000000 +0200 @@ -1,2 +1,2 @@ -version_info = (4, 2, 0) +version_info = (4, 2, 1) __version__ = '.'.join(map(str, version_info)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconsole-4.2.0/qtconsole/console_widget.py new/qtconsole-4.2.1/qtconsole/console_widget.py --- old/qtconsole-4.2.0/qtconsole/console_widget.py 2016-02-23 08:55:38.000000000 +0100 +++ new/qtconsole-4.2.1/qtconsole/console_widget.py 2016-03-30 18:11:36.000000000 +0200 @@ -15,7 +15,7 @@ from traitlets.config.configurable import LoggingConfigurable from qtconsole.rich_text import HtmlExporter -from qtconsole.util import MetaQObjectHasTraits, get_font +from qtconsole.util import MetaQObjectHasTraits, get_font, superQ from ipython_genutils.text import columnize from traitlets import Bool, Enum, Integer, Unicode from .ansi_code_processor import QtAnsiCodeProcessor @@ -35,7 +35,7 @@ # Classes #----------------------------------------------------------------------------- -class ConsoleWidget(MetaQObjectHasTraits('NewBase', (LoggingConfigurable, QtGui.QWidget), {})): +class ConsoleWidget(MetaQObjectHasTraits('NewBase', (LoggingConfigurable, superQ(QtGui.QWidget)), {})): """ An abstract base class for console-type widgets. This class has functionality for: @@ -207,8 +207,9 @@ parent : QWidget, optional [default None] The parent for this widget. """ - QtGui.QWidget.__init__(self, parent) - LoggingConfigurable.__init__(self, **kw) + super(ConsoleWidget, self).__init__(**kw) + if parent: + self.setParent(parent) # While scrolling the pager on Mac OS X, it tears badly. The # NativeGesture is platform and perhaps build-specific hence diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconsole-4.2.0/qtconsole/util.py new/qtconsole-4.2.1/qtconsole/util.py --- old/qtconsole-4.2.0/qtconsole/util.py 2015-07-20 21:59:46.000000000 +0200 +++ new/qtconsole-4.2.1/qtconsole/util.py 2016-03-30 18:11:36.000000000 +0200 @@ -45,8 +45,8 @@ # Classes #----------------------------------------------------------------------------- -class SuperQObject(QtCore.QObject): - """ Permits the use of super() in class hierarchies that contain QObject. +def superQ(QClass): + """ Permits the use of super() in class hierarchies that contain Qt classes. Unlike QObject, SuperQObject does not accept a QObject parent. If it did, super could not be emulated properly (all other classes in the heierarchy @@ -56,22 +56,27 @@ This class is primarily useful for attaching signals to existing non-Qt classes. See QtKernelManagerMixin for an example. """ + class SuperQClass(QClass): - def __new__(cls, *args, **kw): - # We initialize QObject as early as possible. Without this, Qt complains - # if SuperQObject is not the first class in the super class list. - inst = QtCore.QObject.__new__(cls) - QtCore.QObject.__init__(inst) - return inst - - def __init__(self, *args, **kw): - # Emulate super by calling the next method in the MRO, if there is one. - mro = self.__class__.mro() - for qt_class in QtCore.QObject.mro(): - mro.remove(qt_class) - next_index = mro.index(SuperQObject) + 1 - if next_index < len(mro): - mro[next_index].__init__(self, *args, **kw) + def __new__(cls, *args, **kw): + # We initialize QClass as early as possible. Without this, Qt complains + # if SuperQClass is not the first class in the super class list. + inst = QClass.__new__(cls) + QClass.__init__(inst) + return inst + + def __init__(self, *args, **kw): + # Emulate super by calling the next method in the MRO, if there is one. + mro = self.__class__.mro() + for qt_class in QClass.mro(): + mro.remove(qt_class) + next_index = mro.index(SuperQClass) + 1 + if next_index < len(mro): + mro[next_index].__init__(self, *args, **kw) + + return SuperQClass + +SuperQObject = superQ(QtCore.QObject) #----------------------------------------------------------------------------- # Functions
participants (1)
-
root@hilbert.suse.de