From 2b18e3d5fed8d870fa7009db68bf0d56be13f1ca7e7599fe38e050ee519bb345 Mon Sep 17 00:00:00 2001
From: Todd R <toddrme2178@gmail.com>
Date: Wed, 11 Mar 2020 13:36:41 +0000
Subject: [PATCH] Accepting request 783837 from
 home:TheBlackCat:branches:devel:languages:python:jupyter

- Add fix_jupyter_client_6.patch
  Fixes issue with jupyter-client > 6
  From: https://github.com/ipython/ipykernel/pull/489
  See: https://github.com/jupyter/jupyter_client/issues/523

OBS-URL: https://build.opensuse.org/request/show/783837
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-ipykernel?expand=0&rev=14
---
 fix_jupyter_client_6.patch | 34 ++++++++++++++++++++++++++++++++++
 python-ipykernel.changes   |  8 ++++++++
 python-ipykernel.spec      |  4 +++-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 fix_jupyter_client_6.patch

diff --git a/fix_jupyter_client_6.patch b/fix_jupyter_client_6.patch
new file mode 100644
index 0000000..5c201bf
--- /dev/null
+++ b/fix_jupyter_client_6.patch
@@ -0,0 +1,34 @@
+From 7125d8537753106bc5885a906b8dfa90379e1091 Mon Sep 17 00:00:00 2001
+From: David Brochart <david.brochart@gmail.com>
+Date: Mon, 2 Mar 2020 10:09:37 +0100
+Subject: [PATCH] Add control channel
+
+---
+ ipykernel/inprocess/client.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/ipykernel/inprocess/client.py b/ipykernel/inprocess/client.py
+index 2e562f04..5de4f774 100644
+--- a/ipykernel/inprocess/client.py
++++ b/ipykernel/inprocess/client.py
+@@ -41,6 +41,7 @@ class InProcessKernelClient(KernelClient):
+     shell_channel_class = Type(InProcessChannel)
+     iopub_channel_class = Type(InProcessChannel)
+     stdin_channel_class = Type(InProcessChannel)
++    control_channel_class = Type(InProcessChannel)
+     hb_channel_class = Type(InProcessHBChannel)
+ 
+     kernel = Instance('ipykernel.inprocess.ipkernel.InProcessKernel',
+@@ -82,6 +83,12 @@ def stdin_channel(self):
+             self._stdin_channel = self.stdin_channel_class(self)
+         return self._stdin_channel
+ 
++    @property
++    def control_channel(self):
++        if self._control_channel is None:
++            self._control_channel = self.control_channel_class(self)
++        return self._control_channel
++
+     @property
+     def hb_channel(self):
+         if self._hb_channel is None:
diff --git a/python-ipykernel.changes b/python-ipykernel.changes
index 69eae01..03b6430 100644
--- a/python-ipykernel.changes
+++ b/python-ipykernel.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Mar 11 13:31:10 UTC 2020 - Todd R <toddrme2178@gmail.com>
+
+- Add fix_jupyter_client_6.patch
+  Fixes issue with jupyter-client > 6
+  From: https://github.com/ipython/ipykernel/pull/489
+  See: https://github.com/jupyter/jupyter_client/issues/523
+
 -------------------------------------------------------------------
 Tue Jan 28 15:46:11 UTC 2020 - Todd R <toddrme2178@gmail.com>
 
diff --git a/python-ipykernel.spec b/python-ipykernel.spec
index d1ee23c..cd338c5 100644
--- a/python-ipykernel.spec
+++ b/python-ipykernel.spec
@@ -26,6 +26,8 @@ License:        BSD-3-Clause
 Group:          Development/Languages/Python
 URL:            https://github.com/ipython/ipykernel
 Source:         https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM fix_jupyter_client_6.patch -- https://github.com/ipython/ipykernel/pull/489
+Patch0:         fix_jupyter_client_6.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
@@ -83,7 +85,7 @@ This package provides the IPython kernel for Jupyter.
 This package provides the jupyter components.
 
 %prep
-%setup -q -n ipykernel-%{version}
+%autosetup -p1 -n ipykernel-%{version}
 
 %build
 %python_build