Hello community,
here is the log from the commit of package python-jupyter_qtconsole for
openSUSE:Factory checked in at 2016-02-23 16:57:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jupyter_qtconsole (Old)
and /work/SRC/openSUSE:Factory/.python-jupyter_qtconsole.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jupyter_qtconsole"
Changes:
--------
New Changes file:
--- /dev/null 2016-01-27 19:41:03.648095915 +0100
+++
/work/SRC/openSUSE:Factory/.python-jupyter_qtconsole.new/python-jupyter_qtconsole-doc.changes
2016-02-23 16:59:13.000000000 +0100
@@ -0,0 +1,33 @@
+-------------------------------------------------------------------
+Thu Feb 18 11:05:45 UTC 2016 - [email protected]
+
+- update to version 4.1.1:
+ * Set AppUserModelID for Windows 7 and later
+ * Switch to using qtconsole module to find qt
+ * Fix Travis tests for Python 2
+ * Updated example for creating inprocess qtconsole
+ * Enable 3.5 on travis
+- Split documentation into subpackage
+
+-------------------------------------------------------------------
+Fri Oct 16 12:15:08 UTC 2015 - [email protected]
+
+- Update to 4.1.0
+ * Fixed generating the default configuration
+ * Fixed some regressions in copy/paste from the console.
+
+-------------------------------------------------------------------
+Mon Oct 5 10:01:17 UTC 2015 - [email protected]
+
+- Build documentation
+
+-------------------------------------------------------------------
+Fri Aug 21 11:03:50 UTC 2015 - [email protected]
+
+- Remove duplicate requirements
+
+-------------------------------------------------------------------
+Thu Aug 13 12:39:48 UTC 2015 - [email protected]
+
+- Initial version
+
---
/work/SRC/openSUSE:Factory/python-jupyter_qtconsole/python-jupyter_qtconsole.changes
2015-11-18 22:34:23.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python-jupyter_qtconsole.new/python-jupyter_qtconsole.changes
2016-02-23 16:59:13.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Feb 18 11:05:45 UTC 2016 - [email protected]
+
+- update to version 4.1.1:
+ * Set AppUserModelID for Windows 7 and later
+ * Switch to using qtconsole module to find qt
+ * Fix Travis tests for Python 2
+ * Updated example for creating inprocess qtconsole
+ * Enable 3.5 on travis
+- Split documentation into subpackage
+
+-------------------------------------------------------------------
Old:
----
qtconsole-4.1.0.tar.gz
New:
----
python-jupyter_qtconsole-doc.changes
python-jupyter_qtconsole-doc.spec
qtconsole-4.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jupyter_qtconsole-doc.spec ++++++
#
# spec file for package python-jupyter_qtconsole-doc
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} >
1110 )
%define build_pdf 1
%else
%define build_pdf 0
%endif
Name: python-jupyter_qtconsole-doc
Version: 4.1.1
Release: 0
Summary: Documentation for python-jupyter_qtconsole
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
BuildRequires: python-jupyter_qtconsole
# Documentation requirements
BuildRequires: python-Sphinx
%if %{build_pdf}
BuildRequires: python-Sphinx-latex
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
Documentation and help files for python-jupyter_qtconsole.
%package html
Summary: HTML documentation for python-jupyter_qtconsole
Recommends: python-jupyter_qtconsole = %{version}
%description html
Documentation and help files for python-jupyter_qtconsole in HTML format.
%package pdf
Summary: HTML documentation for python-jupyter_qtconsole
Recommends: python-jupyter_qtconsole = %{version}
%description pdf
Documentation and help files for python-jupyter_qtconsole in PDF format.
%prep
%setup -q -n qtconsole-%{version}
%build
# Not needed
%install
# Build the documentation
pushd docs
sed -i -s 's/ python3 / python /' Makefile
%if %{build_pdf}
PYTHONPATH=%{buildroot}%{python_sitelib} make latexpdf
%endif
PYTHONPATH=%{buildroot}%{python_sitelib} make html
rm -rf build/html/.buildinfo
popd
%files html
%defattr(-,root,root,-)
%doc COPYING.md
%doc docs/build/html/
%if %{build_pdf}
%files pdf
%defattr(-,root,root,-)
%doc COPYING.md
%doc docs/build/latex/*.pdf
%endif
%changelog
++++++ python-jupyter_qtconsole.spec ++++++
--- /var/tmp/diff_new_pack.Ydo51Y/_old 2016-02-23 16:59:14.000000000 +0100
+++ /var/tmp/diff_new_pack.Ydo51Y/_new 2016-02-23 16:59:14.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-jupyter_qtconsole
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: python-jupyter_qtconsole
-Version: 4.1.0
+Version: 4.1.1
Release: 0
Summary: Jupyter Qt console
License: BSD-3-Clause
@@ -44,11 +44,6 @@
%endif
# Python 2 test requirements
BuildRequires: python-mock
-# Documentation requirements
-BuildRequires: python-Sphinx
-%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} >
1110 )
-BuildRequires: python-Sphinx-latex
-%endif
Requires: hicolor-icon-theme
Requires: python-Pygments
Requires: python-jupyter_client
@@ -76,20 +71,6 @@
A rich Qt-based console for working with Jupyter kernels,
supporting rich media output, session export, and more.
-%package doc-html
-Summary: HTML documentation for %{name}
-Recommends: %{name} = %{version}
-
-%description doc-html
-Documentation and help files for %{name} in HTML format
-
-%package doc-pdf
-Summary: HTML documentation for %{name}
-Recommends: %{name} = %{version}
-
-%description doc-pdf
-Documentation and help files for %{name} in PDF format
-
%prep
%setup -q -n qtconsole-%{version}
@@ -118,16 +99,6 @@
desktop-file-edit --set-comment="Jupyter qtconsole for Python %{py_ver}"
--set-name="Jupyter Qt console for Python %{py_ver}"
--set-generic-name="Jupyter shell for Python %{py_ver}" --set-key="Exec"
--set-value="jupyter-qtconsole-%{py_ver}"
--set-icon="JupyterQtConsole-%{py_ver}" jupyter-qtconsole-%{py_ver}.desktop
%suse_update_desktop_file -i -r jupyter-qtconsole-%{py_ver}
"System;TerminalEmulator;"
-# Build the documentation
-pushd docs
-sed -i -s 's/ python3 / python /' Makefile
-%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} >
1110 )
-PYTHONPATH=%{buildroot}%{python_sitelib} make latexpdf
-%endif
-PYTHONPATH=%{buildroot}%{python_sitelib} make html
-rm -rf build/html/.buildinfo
-popd
-
%post
%_sbindir/update-alternatives \
--install %{_bindir}/jupyter-qtconsole jupyter-qtconsole
%{_bindir}/jupyter-qtconsole-%{py_ver} 30
@@ -156,16 +127,4 @@
%{_datadir}/icons/hicolor/scalable/apps/JupyterQtConsole-%{py_ver}.svg
%{python_sitelib}/*
-%files doc-html
-%defattr(-,root,root,-)
-%doc COPYING.md
-%doc docs/build/html/
-
-%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} >
1110 )
-%files doc-pdf
-%defattr(-,root,root,-)
-%doc COPYING.md
-%doc docs/build/latex/*.pdf
-%endif
-
%changelog
++++++ qtconsole-4.1.0.tar.gz -> qtconsole-4.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-4.1.0/PKG-INFO new/qtconsole-4.1.1/PKG-INFO
--- old/qtconsole-4.1.0/PKG-INFO 2015-10-16 13:39:58.000000000 +0200
+++ new/qtconsole-4.1.1/PKG-INFO 2015-11-25 15:42:50.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: qtconsole
-Version: 4.1.0
+Version: 4.1.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.1.0/docs/source/changelog.rst
new/qtconsole-4.1.1/docs/source/changelog.rst
--- old/qtconsole-4.1.0/docs/source/changelog.rst 2015-10-16
13:38:00.000000000 +0200
+++ new/qtconsole-4.1.1/docs/source/changelog.rst 2015-11-25
15:42:02.000000000 +0100
@@ -4,6 +4,16 @@
============================
.. _4.1:
+
+.. _4.1.1:
+
+4.1.1
+-----
+
+`4.1.1 on GitHub <https://github.com/jupyter/qtconsole/milestones/4.1.1>`__
+
+- Set AppUserModelID for taskbar icon on Windows 7 and later
+
.. _4.1.0:
4.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-4.1.0/docs/source/config_options.rst
new/qtconsole-4.1.1/docs/source/config_options.rst
--- old/qtconsole-4.1.0/docs/source/config_options.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/qtconsole-4.1.1/docs/source/config_options.rst 2015-10-16
13:40:58.000000000 +0200
@@ -0,0 +1,442 @@
+Configuration options
+=====================
+
+These options can be set in ``~/.jupyer/jupyter_qtconsole_config.py``, or
+at the command line when you start it.
+
+
+ConnectionFileMixin.connection_file : Unicode
+ Default: ``''``
+
+ JSON file in which to store connection info [default: kernel-<pid>.json]
+
+ This file will contain the IP, ports, and authentication key needed to
connect
+ clients to this kernel. By default, this file will be created in the
security dir
+ of the current profile, but can be specified by absolute path.
+
+
+ConnectionFileMixin.control_port : Int
+ Default: ``0``
+
+ set the control (ROUTER) port [default: random]
+
+ConnectionFileMixin.hb_port : Int
+ Default: ``0``
+
+ set the heartbeat port [default: random]
+
+ConnectionFileMixin.iopub_port : Int
+ Default: ``0``
+
+ set the iopub (PUB) port [default: random]
+
+ConnectionFileMixin.ip : Unicode
+ Default: ``''``
+
+ Set the kernel's IP address [default localhost].
+ If the IP address is something other than localhost, then
+ Consoles on other machines will be able to connect
+ to the Kernel, so be careful!
+
+ConnectionFileMixin.shell_port : Int
+ Default: ``0``
+
+ set the shell (ROUTER) port [default: random]
+
+ConnectionFileMixin.stdin_port : Int
+ Default: ``0``
+
+ set the stdin (ROUTER) port [default: random]
+
+ConnectionFileMixin.transport : 'tcp'|'ipc'
+ Default: ``'tcp'``
+
+ No description
+
+JupyterConsoleApp.confirm_exit : CBool
+ Default: ``True``
+
+
+ Set to display confirmation dialog on exit. You can always use 'exit' or
'quit',
+ to force a direct exit without any confirmation.
+
+JupyterConsoleApp.existing : CUnicode
+ Default: ``''``
+
+ Connect to an already running kernel
+
+JupyterConsoleApp.kernel_name : Unicode
+ Default: ``'python'``
+
+ The name of the default kernel to start.
+
+JupyterConsoleApp.sshkey : Unicode
+ Default: ``''``
+
+ Path to the ssh key to use for logging in to the ssh server.
+
+JupyterConsoleApp.sshserver : Unicode
+ Default: ``''``
+
+ The SSH server to use to connect to the kernel.
+
+
+Application.log_datefmt : Unicode
+ Default: ``'%Y-%m-%d %H:%M:%S'``
+
+ The date format used by logging formatters for %(asctime)s
+
+Application.log_format : Unicode
+ Default: ``'[%(name)s]%(highlevel)s %(message)s'``
+
+ The Logging format template
+
+Application.log_level :
0|10|20|30|40|50|'DEBUG'|'INFO'|'WARN'|'ERROR'|'CRITICAL'
+ Default: ``30``
+
+ Set the log level by value or name.
+
+JupyterApp.answer_yes : Bool
+ Default: ``False``
+
+ Answer yes to any prompts.
+
+JupyterApp.config_file : Unicode
+ Default: ``''``
+
+ Full path of a config file.
+
+JupyterApp.config_file_name : Unicode
+ Default: ``''``
+
+ Specify a config file to load.
+
+JupyterApp.generate_config : Bool
+ Default: ``False``
+
+ Generate default config file.
+
+JupyterQtConsoleApp.display_banner : CBool
+ Default: ``True``
+
+ Whether to display a banner upon starting the QtConsole.
+
+JupyterQtConsoleApp.hide_menubar : CBool
+ Default: ``False``
+
+ Start the console window with the menu bar hidden.
+
+JupyterQtConsoleApp.maximize : CBool
+ Default: ``False``
+
+ Start the console window maximized.
+
+JupyterQtConsoleApp.plain : CBool
+ Default: ``False``
+
+ Use a plaintext widget instead of rich text (plain can't print/save).
+
+JupyterQtConsoleApp.stylesheet : Unicode
+ Default: ``''``
+
+ path to a custom CSS stylesheet
+
+
+ConsoleWidget.ansi_codes : Bool
+ Default: ``True``
+
+ Whether to process ANSI escape codes.
+
+ConsoleWidget.buffer_size : Int
+ Default: ``500``
+
+
+ The maximum number of lines of text before truncation. Specifying a
+ non-positive number disables text truncation (not recommended).
+
+
+ConsoleWidget.execute_on_complete_input : Bool
+ Default: ``True``
+
+ Whether to automatically execute on syntactically complete input.
+
+ If False, Shift-Enter is required to submit each execution.
+ Disabling this is mainly useful for non-Python kernels,
+ where the completion check would be wrong.
+
+
+ConsoleWidget.font_family : Unicode
+ Default: ``''``
+
+ The font family to use for the console.
+ On OSX this defaults to Monaco, on Windows the default is
+ Consolas with fallback of Courier, and on other platforms
+ the default is Monospace.
+
+
+ConsoleWidget.font_size : Int
+ Default: ``0``
+
+ The font size. If unconfigured, Qt will be entrusted
+ with the size of the font.
+
+
+ConsoleWidget.gui_completion : 'plain'|'droplist'|'ncurses'
+ Default: ``'ncurses'``
+
+
+ The type of completer to use. Valid values are:
+
+ 'plain' : Show the available completion as a text list
+ Below the editing area.
+ 'droplist': Show the completion in a drop down list navigable
+ by the arrow keys, and from which you can select
+ completion by pressing Return.
+ 'ncurses' : Show the completion as a text list which is navigable by
+ `tab` and arrow keys.
+
+
+ConsoleWidget.height : Int
+ Default: ``25``
+
+ The height of the console at start time in number
+ of characters (will double with `vsplit` paging)
+
+
+ConsoleWidget.include_other_output : Bool
+ Default: ``False``
+
+ Whether to include output from clients
+ other than this one sharing the same kernel.
+
+ Outputs are not displayed until enter is pressed.
+
+
+ConsoleWidget.kind : 'plain'|'rich'
+ Default: ``'plain'``
+
+
+ The type of underlying text widget to use. Valid values are 'plain',
+ which specifies a QPlainTextEdit, and 'rich', which specifies a
+ QTextEdit.
+
+
+ConsoleWidget.paging : 'inside'|'hsplit'|'vsplit'|'custom'|'none'
+ Default: ``'inside'``
+
+
+ The type of paging to use. Valid values are:
+
+ 'inside'
+ The widget pages like a traditional terminal.
+ 'hsplit'
+ When paging is requested, the widget is split horizontally. The top
+ pane contains the console, and the bottom pane contains the paged text.
+ 'vsplit'
+ Similar to 'hsplit', except that a vertical splitter is used.
+ 'custom'
+ No action is taken by the widget beyond emitting a
+ 'custom_page_requested(str)' signal.
+ 'none'
+ The text is written directly to the console.
+
+
+ConsoleWidget.width : Int
+ Default: ``81``
+
+ The width of the console at start time in number
+ of characters (will double with `hsplit` paging)
+
+
+HistoryConsoleWidget.history_lock : Bool
+ Default: ``False``
+
+ No description
+
+FrontendWidget.banner : Unicode
+ Default: ``''``
+
+ No description
+
+FrontendWidget.clear_on_kernel_restart : Bool
+ Default: ``True``
+
+ Whether to clear the console when the kernel is restarted
+
+FrontendWidget.confirm_restart : Bool
+ Default: ``True``
+
+ Whether to ask for user confirmation when restarting kernel
+
+FrontendWidget.enable_calltips : Bool
+ Default: ``True``
+
+ Whether to draw information calltips on open-parentheses.
+
+FrontendWidget.is_complete_timeout : Float
+ Default: ``0.25``
+
+ Seconds to wait for is_complete replies from the kernel.
+
+FrontendWidget.lexer_class : DottedObjectName
+ Default: ``traitlets.Undefined``
+
+ The pygments lexer class to use.
+
+
+JupyterWidget.editor : Unicode
+ Default: ``''``
+
+
+ A command for invoking a system text editor. If the string contains a
+ {filename} format specifier, it will be used. Otherwise, the filename
+ will be appended to the end the command.
+
+
+JupyterWidget.editor_line : Unicode
+ Default: ``''``
+
+
+ The editor command to use when a specific line number is requested. The
+ string should contain two format specifiers: {line} and {filename}. If
+ this parameter is not specified, the line number option to the %edit
+ magic will be ignored.
+
+
+JupyterWidget.in_prompt : Unicode
+ Default: ``'In [<span class="in-prompt-number">%i</span>]: '``
+
+ No description
+
+JupyterWidget.input_sep : Unicode
+ Default: ``'\\n'``
+
+ No description
+
+JupyterWidget.out_prompt : Unicode
+ Default: ``'Out[<span class="out-prompt-number">%i</span>]: '``
+
+ No description
+
+JupyterWidget.output_sep : Unicode
+ Default: ``''``
+
+ No description
+
+JupyterWidget.output_sep2 : Unicode
+ Default: ``''``
+
+ No description
+
+JupyterWidget.style_sheet : Unicode
+ Default: ``''``
+
+
+ A CSS stylesheet. The stylesheet can contain classes for:
+ 1. Qt: QPlainTextEdit, QFrame, QWidget, etc
+ 2. Pygments: .c, .k, .o, etc. (see PygmentsHighlighter)
+ 3. QtConsole: .error, .in-prompt, .out-prompt, etc
+
+
+JupyterWidget.syntax_style : Unicode
+ Default: ``''``
+
+
+ If not empty, use this Pygments style for syntax highlighting.
+ Otherwise, the style sheet is queried for Pygments style
+ information.
+
+
+KernelManager.autorestart : Bool
+ Default: ``False``
+
+ Should we autorestart the kernel if it dies.
+
+KernelManager.kernel_cmd : List
+ Default: ``[]``
+
+ DEPRECATED: Use kernel_name instead.
+
+ The Popen Command to launch the kernel.
+ Override this if you have a custom kernel.
+ If kernel_cmd is specified in a configuration file,
+ Jupyter does not pass any arguments to the kernel,
+ because it cannot make any assumptions about the
+ arguments that the kernel understands. In particular,
+ this means that the kernel does not receive the
+ option --debug if it given on the Jupyter command line.
+
+
+Session.buffer_threshold : Int
+ Default: ``1024``
+
+ Threshold (in bytes) beyond which an object's buffer should be extracted
to avoid pickling.
+
+Session.copy_threshold : Int
+ Default: ``65536``
+
+ Threshold (in bytes) beyond which a buffer should be sent without copying.
+
+Session.debug : Bool
+ Default: ``False``
+
+ Debug output in the Session
+
+Session.digest_history_size : Int
+ Default: ``65536``
+
+ The maximum number of digests to remember.
+
+ The digest history will be culled when it exceeds this value.
+
+
+Session.item_threshold : Int
+ Default: ``64``
+
+ The maximum number of items for a container to be introspected for custom
serialization.
+ Containers larger than this are pickled outright.
+
+
+Session.key : CBytes
+ Default: ``b''``
+
+ execution key, for signing messages.
+
+Session.keyfile : Unicode
+ Default: ``''``
+
+ path to file containing execution key.
+
+Session.metadata : Dict
+ Default: ``{}``
+
+ Metadata dictionary, which serves as the default top-level metadata dict
for each message.
+
+Session.packer : DottedObjectName
+ Default: ``'json'``
+
+ The name of the packer for serializing messages.
+ Should be one of 'json', 'pickle', or an import name
+ for a custom callable serializer.
+
+Session.session : CUnicode
+ Default: ``''``
+
+ The UUID identifying this session.
+
+Session.signature_scheme : Unicode
+ Default: ``'hmac-sha256'``
+
+ The digest scheme used to construct the message signatures.
+ Must have the form 'hmac-HASH'.
+
+Session.unpacker : DottedObjectName
+ Default: ``'json'``
+
+ The name of the unpacker for unserializing messages.
+ Only used with custom functions for `packer`.
+
+Session.username : Unicode
+ Default: ``'minrk'``
+
+ Username for the Session. Default is your system username.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-4.1.0/examples/inprocess_qtconsole.py
new/qtconsole-4.1.1/examples/inprocess_qtconsole.py
--- old/qtconsole-4.1.0/examples/inprocess_qtconsole.py 1970-01-01
01:00:00.000000000 +0100
+++ new/qtconsole-4.1.1/examples/inprocess_qtconsole.py 2015-11-25
15:39:13.000000000 +0100
@@ -0,0 +1,37 @@
+"""
+An example of opening up an RichJupyterWidget in a PyQT Application, this can
+execute either stand-alone or by importing this file and calling
+inprocess_qtconsole.show().
+
+Based on the earlier example in the IPython repository, this has
+been updated to use qtconsole.
+"""
+
+
+from qtconsole.qt import QtGui
+from qtconsole.rich_jupyter_widget import RichJupyterWidget
+from qtconsole.inprocess import QtInProcessKernelManager
+
+
+def show():
+ global ipython_widget # Prevent from being garbage collected
+
+ # Create an in-process kernel
+ kernel_manager = QtInProcessKernelManager()
+ kernel_manager.start_kernel(show_banner=False)
+ kernel = kernel_manager.kernel
+ kernel.gui = 'qt4'
+
+ kernel_client = kernel_manager.client()
+ kernel_client.start_channels()
+
+ ipython_widget = RichJupyterWidget()
+ ipython_widget.kernel_manager = kernel_manager
+ ipython_widget.kernel_client = kernel_client
+ ipython_widget.show()
+
+
+if __name__ == "__main__":
+ app = QtGui.QApplication([])
+ show()
+ app.exec_()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-4.1.0/qtconsole/_version.py
new/qtconsole-4.1.1/qtconsole/_version.py
--- old/qtconsole-4.1.0/qtconsole/_version.py 2015-10-16 13:38:31.000000000
+0200
+++ new/qtconsole-4.1.1/qtconsole/_version.py 2015-11-25 15:39:21.000000000
+0100
@@ -1,2 +1,2 @@
-version_info = (4, 1, 0)
+version_info = (4, 1, 1)
__version__ = '.'.join(map(str, version_info))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconsole-4.1.0/qtconsole/qtconsoleapp.py
new/qtconsole-4.1.1/qtconsole/qtconsoleapp.py
--- old/qtconsole-4.1.0/qtconsole/qtconsoleapp.py 2015-10-08
16:28:13.000000000 +0200
+++ new/qtconsole-4.1.1/qtconsole/qtconsoleapp.py 2015-11-25
15:32:43.000000000 +0100
@@ -12,16 +12,24 @@
import sys
from warnings import warn
-# If run on Windows, install an exception hook which pops up a
-# message box. Pythonw.exe hides the console, so without this
-# the application silently fails to load.
+# If run on Windows:
+#
+# 1. Install an exception hook which pops up a message box.
+# Pythonw.exe hides the console, so without this the application
+# silently fails to load.
#
# We always install this handler, because the expectation is for
# qtconsole to bring up a GUI even if called from the console.
# The old handler is called, so the exception is printed as well.
# If desired, check for pythonw with an additional condition
# (sys.executable.lower().find('pythonw.exe') >= 0).
+#
+# 2. Set AppUserModelID for Windows 7 and later so that qtconsole
+# uses its assigned taskbar icon instead of grabbing the one with
+# the same AppUserModelID
+#
if os.name == 'nt':
+ # 1.
old_excepthook = sys.excepthook
# Exclude this from our autogenerated API docs.
@@ -42,6 +50,13 @@
sys.excepthook = gui_excepthook
+ # 2.
+ try:
+ from ctypes import windll
+
windll.shell32.SetCurrentProcessExplicitAppUserModelID("Jupyter.Qtconsole")
+ except AttributeError:
+ pass
+
from qtconsole.qt import QtCore, QtGui
from traitlets.config.application import boolean_flag
