Hello community,
here is the log from the commit of package python-ipykernel for
openSUSE:Factory checked in at 2019-11-22 10:23:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ipykernel (Old)
and /work/SRC/openSUSE:Factory/.python-ipykernel.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ipykernel"
Fri Nov 22 10:23:47 2019 rev:3 rq:747913 version:5.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ipykernel/python-ipykernel.changes
2019-08-16 15:27:01.686015216 +0200
+++
/work/SRC/openSUSE:Factory/.python-ipykernel.new.26869/python-ipykernel.changes
2019-11-22 10:23:48.553302121 +0100
@@ -1,0 +2,12 @@
+Tue Nov 12 17:03:09 UTC 2019 - Todd R <[email protected]>
+
+- Update to 5.1.3
+ * Fix comm shutdown behavior by adding a ``deleting`` option to ``close``
which can be set to prevent registering new comm channels during shutdown
+ * Fix ``Heartbeat._bind_socket`` to return on the first bind
+ * Moved ``InProcessKernelClient.flush`` to ``DummySocket``
+ * Don't redirect stdout if nose machinery is not present
+ * Rename `_asyncio.py` to `_asyncio_utils.py` to avoid name conflicts on
Python 3.6+
+ * Only generate kernelspec when installing or building wheel
+ * Fix priority ordering of control-channel messages in some cases
+
+-------------------------------------------------------------------
Old:
----
ipykernel-5.1.2.tar.gz
New:
----
ipykernel-5.1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ipykernel.spec ++++++
--- /var/tmp/diff_new_pack.e6g6Ln/_old 2019-11-22 10:23:49.177301937 +0100
+++ /var/tmp/diff_new_pack.e6g6Ln/_new 2019-11-22 10:23:49.181301936 +0100
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-ipykernel
-Version: 5.1.2
+Version: 5.1.3
Release: 0
Summary: IPython Kernel for Jupyter
License: BSD-3-Clause
@@ -32,17 +32,18 @@
BuildRequires: python-rpm-macros
Requires: jupyter-ipykernel = %{version}
Requires: python-ipython >= 5.0.0
-Requires: python-jupyter_client
-Requires: python-jupyter_core
+Requires: python-jupyter-client
+Requires: python-jupyter-core
Requires: python-tornado >= 4.2
Requires: python-traitlets >= 4.1.0
Provides: python-jupyter_ipykernel = %{version}
Obsoletes: python-jupyter_ipykernel < %{version}
BuildArch: noarch
# SECTION test requirements
+BuildRequires: %{python_module flaky}
BuildRequires: %{python_module ipython >= 5.0.0}
-BuildRequires: %{python_module jupyter_client}
-BuildRequires: %{python_module jupyter_core}
+BuildRequires: %{python_module jupyter-client}
+BuildRequires: %{python_module jupyter-core}
BuildRequires: %{python_module nose_warnings_filters}
BuildRequires: %{python_module nose}
BuildRequires: %{python_module numpy}
@@ -72,7 +73,7 @@
%package -n jupyter-ipykernel
Summary: IPython Kernel for Jupyter
Requires: hicolor-icon-theme
-Requires: jupyter-jupyter_client
+Requires: jupyter-jupyter-client
Requires: python3-ipykernel = %{version}
Conflicts: python3-jupyter_ipykernel < 5.1.1
++++++ ipykernel-5.1.2.tar.gz -> ipykernel-5.1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/PKG-INFO new/ipykernel-5.1.3/PKG-INFO
--- old/ipykernel-5.1.2/PKG-INFO 2019-08-07 22:41:07.000000000 +0200
+++ new/ipykernel-5.1.3/PKG-INFO 2019-10-20 13:55:39.000000000 +0200
@@ -1,21 +1,21 @@
-Metadata-Version: 2.1
-Name: ipykernel
-Version: 5.1.2
-Summary: IPython Kernel for Jupyter
-Home-page: https://ipython.org
-Author: IPython Development Team
-Author-email: [email protected]
-License: BSD
-Description: The IPython kernel for Jupyter
-Keywords: Interactive,Interpreter,Shell,Web
-Platform: Linux
-Platform: Mac OS X
-Platform: Windows
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.4
-Provides-Extra: test
+Metadata-Version: 2.1
+Name: ipykernel
+Version: 5.1.3
+Summary: IPython Kernel for Jupyter
+Home-page: https://ipython.org
+Author: IPython Development Team
+Author-email: [email protected]
+License: BSD
+Description: The IPython kernel for Jupyter
+Keywords: Interactive,Interpreter,Shell,Web
+Platform: Linux
+Platform: Mac OS X
+Platform: Windows
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.4
+Provides-Extra: test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/docs/changelog.rst
new/ipykernel-5.1.3/docs/changelog.rst
--- old/ipykernel-5.1.2/docs/changelog.rst 2019-08-07 22:40:25.000000000
+0200
+++ new/ipykernel-5.1.3/docs/changelog.rst 2019-10-20 13:54:46.000000000
+0200
@@ -4,6 +4,20 @@
5.1
---
+5.1.3
+*****
+
+5.1.3 Includes several bugfixes and internal logic improvements.
+
+- Fix comm shutdown behavior by adding a ``deleting`` option to ``close``
which can be set to prevent registering new comm channels during shutdown
(:ghpull: `433`, :ghpull: `435`)
+- Fix ``Heartbeat._bind_socket`` to return on the first bind (:ghpull: `431`)
+- Moved ``InProcessKernelClient.flush`` to ``DummySocket`` (:gphull: `437`)
+- Don't redirect stdout if nose machinery is not present (:ghpull: `427`)
+- Rename `_asyncio.py` to `_asyncio_utils.py` to avoid name conflicts on
Python 3.6+ (:ghpull: `426`)
+- Only generate kernelspec when installing or building wheel (:ghpull: `425`)
+- Fix priority ordering of control-channel messages in some cases
(:ghpull:`443`)
+
+
5.1.2
*****
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/_version.py
new/ipykernel-5.1.3/ipykernel/_version.py
--- old/ipykernel-5.1.2/ipykernel/_version.py 2019-08-07 22:40:49.000000000
+0200
+++ new/ipykernel-5.1.3/ipykernel/_version.py 2019-10-20 13:55:13.000000000
+0200
@@ -1,4 +1,4 @@
-version_info = (5,1,2)
+version_info = (5, 1, 3)
__version__ = '.'.join(map(str, version_info[:3]))
# pep440 is annoying, beta/alpha/rc should _not_ have dots or pip/setuptools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/comm/comm.py
new/ipykernel-5.1.3/ipykernel/comm/comm.py
--- old/ipykernel-5.1.2/ipykernel/comm/comm.py 2019-05-16 09:57:20.000000000
+0200
+++ new/ipykernel-5.1.3/ipykernel/comm/comm.py 2019-10-20 13:54:46.000000000
+0200
@@ -73,7 +73,7 @@
def __del__(self):
"""trigger close on gc"""
- self.close()
+ self.close(deleting=True)
# publishing messages
@@ -98,7 +98,7 @@
comm_manager.unregister_comm(self)
raise
- def close(self, data=None, metadata=None, buffers=None):
+ def close(self, data=None, metadata=None, buffers=None, deleting=False):
"""Close the frontend-side version of this comm"""
if self._closed:
# only close once
@@ -113,7 +113,9 @@
self._publish_msg('comm_close',
data=data, metadata=metadata, buffers=buffers,
)
- self.kernel.comm_manager.unregister_comm(self)
+ if not deleting:
+ # If deleting, the comm can't be registered
+ self.kernel.comm_manager.unregister_comm(self)
def send(self, data=None, metadata=None, buffers=None):
"""Send a message to the frontend-side version of this comm"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/comm/manager.py
new/ipykernel-5.1.3/ipykernel/comm/manager.py
--- old/ipykernel-5.1.2/ipykernel/comm/manager.py 2019-05-16
09:57:20.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/comm/manager.py 2019-10-20
13:54:46.000000000 +0200
@@ -119,7 +119,8 @@
comm = self.get_comm(comm_id)
if comm is None:
return
-
+
+ self.comms[comm_id]._closed = True
del self.comms[comm_id]
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/connect.py
new/ipykernel-5.1.3/ipykernel/connect.py
--- old/ipykernel-5.1.2/ipykernel/connect.py 2019-05-16 09:57:20.000000000
+0200
+++ new/ipykernel-5.1.3/ipykernel/connect.py 2019-10-20 13:54:46.000000000
+0200
@@ -40,7 +40,7 @@
def find_connection_file(filename='kernel-*.json', profile=None):
"""DEPRECATED: find a connection file, and return its absolute path.
- THIS FUNCTION IS DEPRECATED. Use juptyer_client.find_connection_file
instead.
+ THIS FUNCTION IS DEPRECATED. Use jupyter_client.find_connection_file
instead.
Parameters
----------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/eventloops.py
new/ipykernel-5.1.3/ipykernel/eventloops.py
--- old/ipykernel-5.1.2/ipykernel/eventloops.py 2019-05-16 09:57:20.000000000
+0200
+++ new/ipykernel-5.1.3/ipykernel/eventloops.py 2019-10-20 13:54:46.000000000
+0200
@@ -154,12 +154,6 @@
import wx
- if _use_appnope() and kernel._darwin_app_nap:
- # we don't hook up App Nap contexts for Wx,
- # just disable it outright.
- from appnope import nope
- nope()
-
# Wx uses milliseconds
poll_interval = int(1000 * kernel._poll_interval)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/heartbeat.py
new/ipykernel-5.1.3/ipykernel/heartbeat.py
--- old/ipykernel-5.1.2/ipykernel/heartbeat.py 2019-08-07 22:39:17.000000000
+0200
+++ new/ipykernel-5.1.3/ipykernel/heartbeat.py 2019-10-20 13:54:46.000000000
+0200
@@ -83,6 +83,8 @@
self.pick_port()
else:
raise
+ else:
+ return
def run(self):
self.socket = self.context.socket(zmq.ROUTER)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/inprocess/client.py
new/ipykernel-5.1.3/ipykernel/inprocess/client.py
--- old/ipykernel-5.1.2/ipykernel/inprocess/client.py 2019-08-07
22:39:17.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/inprocess/client.py 2019-10-20
13:54:46.000000000 +0200
@@ -172,9 +172,6 @@
idents, reply_msg = self.session.recv(stream, copy=False)
self.shell_channel.call_handlers_later(reply_msg)
- def flush(self):
- """no-op to comply with stream API"""
-
#-----------------------------------------------------------------------------
# ABC Registration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/inprocess/socket.py
new/ipykernel-5.1.3/ipykernel/inprocess/socket.py
--- old/ipykernel-5.1.2/ipykernel/inprocess/socket.py 2019-08-07
22:39:17.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/inprocess/socket.py 2019-10-20
13:54:46.000000000 +0200
@@ -61,4 +61,8 @@
self.queue.put_nowait(msg_parts)
self.message_sent += 1
+ def flush(self, timeout=1.0):
+ """no-op to comply with stream API"""
+ pass
+
SocketABC.register(DummySocket)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/ipkernel.py
new/ipykernel-5.1.3/ipykernel/ipkernel.py
--- old/ipykernel-5.1.2/ipykernel/ipkernel.py 2019-05-16 09:57:20.000000000
+0200
+++ new/ipykernel-5.1.3/ipykernel/ipkernel.py 2019-10-20 13:54:46.000000000
+0200
@@ -16,6 +16,7 @@
from .comm import CommManager
from .kernelbase import Kernel as KernelBase
from .zmqshell import ZMQInteractiveShell
+from .eventloops import _use_appnope
try:
from IPython.core.interactiveshell import _asyncio_runner
@@ -79,6 +80,11 @@
for msg_type in comm_msg_types:
self.shell_handlers[msg_type] = getattr(self.comm_manager,
msg_type)
+ if _use_appnope() and self._darwin_app_nap:
+ # Disable app-nap as the kernel is not a gui but can have guis
+ import appnope
+ appnope.nope()
+
help_links = List([
{
'text': "Python Reference",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/kernelbase.py
new/ipykernel-5.1.3/ipykernel/kernelbase.py
--- old/ipykernel-5.1.2/ipykernel/kernelbase.py 2019-05-16 09:57:20.000000000
+0200
+++ new/ipykernel-5.1.3/ipykernel/kernelbase.py 2019-10-20 13:54:46.000000000
+0200
@@ -225,10 +225,6 @@
@gen.coroutine
def dispatch_shell(self, stream, msg):
"""dispatch shell requests"""
- # flush control requests first
- if self.control_stream:
- self.control_stream.flush()
-
idents, msg = self.session.feed_identities(msg, copy=False)
try:
msg = self.session.deserialize(msg, content=True, copy=False)
@@ -373,6 +369,9 @@
"""
while True:
+ # ensure control stream is flushed before processing shell messages
+ if self.control_stream:
+ self.control_stream.flush()
# receive the next message and handle it
try:
yield self.process_one()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/tests/_asyncio.py
new/ipykernel-5.1.3/ipykernel/tests/_asyncio.py
--- old/ipykernel-5.1.2/ipykernel/tests/_asyncio.py 2019-05-16
09:57:20.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/tests/_asyncio.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-"""test utilities that use async/await syntax
-
-a separate file to avoid syntax errors on Python 2
-"""
-
-import asyncio
-
-
-def async_func():
- """Simple async function to schedule a task on the current eventloop"""
- loop = asyncio.get_event_loop()
- assert loop.is_running()
-
- async def task():
- await asyncio.sleep(1)
-
- loop.create_task(task())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/tests/_asyncio_utils.py
new/ipykernel-5.1.3/ipykernel/tests/_asyncio_utils.py
--- old/ipykernel-5.1.2/ipykernel/tests/_asyncio_utils.py 1970-01-01
01:00:00.000000000 +0100
+++ new/ipykernel-5.1.3/ipykernel/tests/_asyncio_utils.py 2019-10-20
13:54:46.000000000 +0200
@@ -0,0 +1,17 @@
+"""test utilities that use async/await syntax
+
+a separate file to avoid syntax errors on Python 2
+"""
+
+import asyncio
+
+
+def async_func():
+ """Simple async function to schedule a task on the current eventloop"""
+ loop = asyncio.get_event_loop()
+ assert loop.is_running()
+
+ async def task():
+ await asyncio.sleep(1)
+
+ loop.create_task(task())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/tests/test_embed_kernel.py
new/ipykernel-5.1.3/ipykernel/tests/test_embed_kernel.py
--- old/ipykernel-5.1.2/ipykernel/tests/test_embed_kernel.py 2019-05-16
09:57:20.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/tests/test_embed_kernel.py 2019-10-20
13:54:46.000000000 +0200
@@ -6,9 +6,11 @@
import os
import sys
import time
+import json
from contextlib import contextmanager
from subprocess import Popen, PIPE
+from flaky import flaky
from jupyter_client import BlockingKernelClient
from jupyter_core import paths
@@ -28,39 +30,57 @@
-------
kernel_manager: connected KernelManager instance
"""
- kernel = Popen([sys.executable, '-c', cmd], stdout=PIPE, stderr=PIPE)
- connection_file = os.path.join(
- paths.jupyter_runtime_dir(),
- 'kernel-%i.json' % kernel.pid,
- )
- # wait for connection file to exist, timeout after 5s
- tic = time.time()
- while not os.path.exists(connection_file) \
- and kernel.poll() is None \
- and time.time() < tic + SETUP_TIMEOUT:
- time.sleep(0.1)
- if kernel.poll() is not None:
- o,e = kernel.communicate()
- e = py3compat.cast_unicode(e)
- raise IOError("Kernel failed to start:\n%s" % e)
-
- if not os.path.exists(connection_file):
- if kernel.poll() is None:
- kernel.terminate()
- raise IOError("Connection file %r never arrived" % connection_file)
-
- client = BlockingKernelClient(connection_file=connection_file)
- client.load_connection_file()
- client.start_channels()
- client.wait_for_ready()
+ def connection_file_ready(connection_file):
+ """Check if connection_file is a readable json file."""
+ if not os.path.exists(connection_file):
+ return False
+ try:
+ with open(connection_file) as f:
+ json.load(f)
+ return True
+ except ValueError:
+ return False
+ kernel = Popen([sys.executable, '-c', cmd], stdout=PIPE, stderr=PIPE)
try:
- yield client
+ connection_file = os.path.join(
+ paths.jupyter_runtime_dir(),
+ 'kernel-%i.json' % kernel.pid,
+ )
+ # wait for connection file to exist, timeout after 5s
+ tic = time.time()
+ while not connection_file_ready(connection_file) \
+ and kernel.poll() is None \
+ and time.time() < tic + SETUP_TIMEOUT:
+ time.sleep(0.1)
+
+ # Wait 100ms for the writing to finish
+ time.sleep(0.1)
+
+ if kernel.poll() is not None:
+ o,e = kernel.communicate()
+ e = py3compat.cast_unicode(e)
+ raise IOError("Kernel failed to start:\n%s" % e)
+
+ if not os.path.exists(connection_file):
+ if kernel.poll() is None:
+ kernel.terminate()
+ raise IOError("Connection file %r never arrived" % connection_file)
+
+ client = BlockingKernelClient(connection_file=connection_file)
+ client.load_connection_file()
+ client.start_channels()
+ client.wait_for_ready()
+ try:
+ yield client
+ finally:
+ client.stop_channels()
finally:
- client.stop_channels()
kernel.terminate()
+
+@flaky(max_runs=3)
def test_embed_kernel_basic():
"""IPython.embed_kernel() is basically functional"""
cmd = '\n'.join([
@@ -93,6 +113,8 @@
text = content['data']['text/plain']
assert '10' in text
+
+@flaky(max_runs=3)
def test_embed_kernel_namespace():
"""IPython.embed_kernel() inherits calling namespace"""
cmd = '\n'.join([
@@ -128,6 +150,7 @@
content = msg['content']
assert not content['found']
+@flaky(max_runs=3)
def test_embed_kernel_reentrant():
"""IPython.embed_kernel() can be called multiple times"""
cmd = '\n'.join([
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/tests/test_eventloop.py
new/ipykernel-5.1.3/ipykernel/tests/test_eventloop.py
--- old/ipykernel-5.1.2/ipykernel/tests/test_eventloop.py 2019-05-16
09:57:20.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/tests/test_eventloop.py 2019-10-20
13:54:46.000000000 +0200
@@ -23,7 +23,7 @@
async_code = """
-from ipykernel.tests._asyncio import async_func
+from ipykernel.tests._asyncio_utils import async_func
async_func()
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/tests/test_heartbeat.py
new/ipykernel-5.1.3/ipykernel/tests/test_heartbeat.py
--- old/ipykernel-5.1.2/ipykernel/tests/test_heartbeat.py 2019-08-07
22:39:17.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/tests/test_heartbeat.py 2019-10-20
13:54:46.000000000 +0200
@@ -21,6 +21,13 @@
assert mock_try_bind.call_count == 1
+def test_port_bind_success():
+ heart = Heartbeat(None)
+ with patch.object(heart, '_try_bind_socket') as mock_try_bind:
+ heart._bind_socket()
+ assert mock_try_bind.call_count == 1
+
+
def test_port_bind_failure_recovery():
try:
errno.WSAEADDRINUSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/tests/test_kernel.py
new/ipykernel-5.1.3/ipykernel/tests/test_kernel.py
--- old/ipykernel-5.1.2/ipykernel/tests/test_kernel.py 2019-08-07
22:39:17.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/tests/test_kernel.py 2019-10-20
13:54:46.000000000 +0200
@@ -11,6 +11,7 @@
import time
import nose.tools as nt
+from flaky import flaky
from IPython.testing import decorators as dec, tools as tt
from ipython_genutils import py3compat
@@ -75,6 +76,7 @@
assert '' in sys_path
+@flaky(max_runs=3)
@dec.skipif(sys.platform == 'win32', "subprocess prints fail on Windows")
def test_subprocess_print():
"""printing from forked mp.Process"""
@@ -104,6 +106,7 @@
_check_master(kc, expected=True, stream="stderr")
+@flaky(max_runs=3)
def test_subprocess_noprint():
"""mp.Process without print doesn't trigger iostream mp_mode"""
with kernel() as kc:
@@ -126,6 +129,7 @@
_check_master(kc, expected=True, stream="stderr")
+@flaky(max_runs=3)
@dec.skipif(sys.platform == 'win32', "subprocess prints fail on Windows")
def test_subprocess_error():
"""error in mp.Process doesn't crash"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/tests/test_start_kernel.py
new/ipykernel-5.1.3/ipykernel/tests/test_start_kernel.py
--- old/ipykernel-5.1.2/ipykernel/tests/test_start_kernel.py 2019-05-16
09:57:20.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/tests/test_start_kernel.py 2019-10-20
13:54:46.000000000 +0200
@@ -1,7 +1,10 @@
from .test_embed_kernel import setup_kernel
+from flaky import flaky
TIMEOUT = 15
+
+@flaky(max_runs=3)
def test_ipython_start_kernel_userns():
cmd = ('from IPython import start_kernel\n'
'ns = {"tre": 123}\n'
@@ -27,6 +30,8 @@
text = content['data']['text/plain']
assert u'DummyMod' in text
+
+@flaky(max_runs=3)
def test_ipython_start_kernel_no_userns():
# Issue #4188 - user_ns should be passed to shell as None, not {}
cmd = ('from IPython import start_kernel\n'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel/tests/utils.py
new/ipykernel-5.1.3/ipykernel/tests/utils.py
--- old/ipykernel-5.1.2/ipykernel/tests/utils.py 2019-05-16
09:57:20.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel/tests/utils.py 2019-10-20
13:54:46.000000000 +0200
@@ -33,11 +33,11 @@
Integrates with our output capturing for tests.
"""
+ kwargs['stderr'] = STDOUT
try:
- stdout = nose.iptest_stdstreams_fileno()
+ kwargs['stdout'] = nose.iptest_stdstreams_fileno()
except AttributeError:
- stdout = open(os.devnull)
- kwargs.update(dict(stdout=stdout, stderr=STDOUT))
+ pass
return manager.start_new_kernel(startup_timeout=STARTUP_TIMEOUT, **kwargs)
@@ -131,8 +131,11 @@
-------
kernel_client: connected KernelClient instance
"""
- stdout = getattr(nose, 'iptest_stdstreams_fileno', open(os.devnull))
- kwargs = dict(stdout=stdout, stderr=STDOUT)
+ kwargs = {'stderr': STDOUT}
+ try:
+ kwargs['stdout'] = nose.iptest_stdstreams_fileno()
+ except AttributeError:
+ pass
if argv is not None:
kwargs['extra_arguments'] = argv
return manager.run_kernel(**kwargs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel.egg-info/PKG-INFO
new/ipykernel-5.1.3/ipykernel.egg-info/PKG-INFO
--- old/ipykernel-5.1.2/ipykernel.egg-info/PKG-INFO 2019-08-07
22:41:05.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel.egg-info/PKG-INFO 2019-10-20
13:55:39.000000000 +0200
@@ -1,21 +1,21 @@
-Metadata-Version: 2.1
-Name: ipykernel
-Version: 5.1.2
-Summary: IPython Kernel for Jupyter
-Home-page: https://ipython.org
-Author: IPython Development Team
-Author-email: [email protected]
-License: BSD
-Description: The IPython kernel for Jupyter
-Keywords: Interactive,Interpreter,Shell,Web
-Platform: Linux
-Platform: Mac OS X
-Platform: Windows
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.4
-Provides-Extra: test
+Metadata-Version: 2.1
+Name: ipykernel
+Version: 5.1.3
+Summary: IPython Kernel for Jupyter
+Home-page: https://ipython.org
+Author: IPython Development Team
+Author-email: [email protected]
+License: BSD
+Description: The IPython kernel for Jupyter
+Keywords: Interactive,Interpreter,Shell,Web
+Platform: Linux
+Platform: Mac OS X
+Platform: Windows
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.4
+Provides-Extra: test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel.egg-info/SOURCES.txt
new/ipykernel-5.1.3/ipykernel.egg-info/SOURCES.txt
--- old/ipykernel-5.1.2/ipykernel.egg-info/SOURCES.txt 2019-08-07
22:41:05.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel.egg-info/SOURCES.txt 2019-10-20
13:55:39.000000000 +0200
@@ -67,7 +67,7 @@
ipykernel/resources/logo-32x32.png
ipykernel/resources/logo-64x64.png
ipykernel/tests/__init__.py
-ipykernel/tests/_asyncio.py
+ipykernel/tests/_asyncio_utils.py
ipykernel/tests/test_async.py
ipykernel/tests/test_connect.py
ipykernel/tests/test_embed_kernel.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/ipykernel.egg-info/requires.txt
new/ipykernel-5.1.3/ipykernel.egg-info/requires.txt
--- old/ipykernel-5.1.2/ipykernel.egg-info/requires.txt 2019-08-07
22:41:05.000000000 +0200
+++ new/ipykernel-5.1.3/ipykernel.egg-info/requires.txt 2019-10-20
13:55:39.000000000 +0200
@@ -3,7 +3,11 @@
jupyter_client
tornado>=4.2
+[:platform_system == "Darwin"]
+appnope
+
[test]
pytest
pytest-cov
+flaky
nose
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/setup.cfg
new/ipykernel-5.1.3/setup.cfg
--- old/ipykernel-5.1.2/setup.cfg 2019-08-07 22:41:07.000000000 +0200
+++ new/ipykernel-5.1.3/setup.cfg 2019-10-20 13:55:39.000000000 +0200
@@ -1,14 +1,14 @@
-[bdist_wheel]
-universal = 0
-
-[metadata]
-license_file = COPYING.md
-
-[nosetests]
-warningfilters = default |.* |DeprecationWarning |ipykernel.*
- error |.*invalid.* |DeprecationWarning |matplotlib.*
-
-[egg_info]
-tag_build =
-tag_date = 0
-
+[bdist_wheel]
+universal = 0
+
+[metadata]
+license_file = COPYING.md
+
+[nosetests]
+warningfilters = default |.* |DeprecationWarning |ipykernel.*
+ error |.*invalid.* |DeprecationWarning |matplotlib.*
+
+[egg_info]
+tag_build =
+tag_date = 0
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ipykernel-5.1.2/setup.py new/ipykernel-5.1.3/setup.py
--- old/ipykernel-5.1.2/setup.py 2019-05-16 09:57:20.000000000 +0200
+++ new/ipykernel-5.1.3/setup.py 2019-10-20 13:54:46.000000000 +0200
@@ -92,11 +92,13 @@
'traitlets>=4.1.0',
'jupyter_client',
'tornado>=4.2',
+ 'appnope;platform_system=="Darwin"',
],
extras_require={
'test': [
'pytest',
'pytest-cov',
+ 'flaky',
'nose', # nose because there are still a few nose.tools imports
hanging around
],
},
@@ -111,10 +113,15 @@
)
-if any(a.startswith(('bdist', 'build', 'install')) for a in sys.argv):
+if any(a.startswith(('bdist', 'install')) for a in sys.argv):
from ipykernel.kernelspec import write_kernel_spec, make_ipkernel_cmd,
KERNEL_NAME
- argv = make_ipkernel_cmd(executable='python')
+ # When building a wheel, the executable specified in the kernelspec is
simply 'python'.
+ if any(a.startswith('bdist') for a in sys.argv):
+ argv = make_ipkernel_cmd(executable='python')
+ # When installing from source, the full `sys.executable` can be used.
+ if any(a.startswith('install') for a in sys.argv):
+ argv = make_ipkernel_cmd()
dest = os.path.join(here, 'data_kernelspec')
if os.path.exists(dest):
shutil.rmtree(dest)