From 375ea01b4db7cde5f14e55cc4e7b6ac5bb005998 Mon Sep 17 00:00:00 2001
From: M Pacer <mpacer@berkeley.edu>
Date: Tue, 15 May 2018 12:56:40 -0700
Subject: [PATCH 1/2] make KernelManager configurable for all who inherit
 JupyterConsoleApp

---
 jupyter_client/consoleapp.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jupyter_client/consoleapp.py b/jupyter_client/consoleapp.py
index ce2ead429..2e27a2918 100644
--- a/jupyter_client/consoleapp.py
+++ b/jupyter_client/consoleapp.py
@@ -18,7 +18,7 @@
 from traitlets.config.application import boolean_flag
 from ipython_genutils.path import filefind
 from traitlets import (
-    Dict, List, Unicode, CUnicode, CBool, Any
+    Dict, List, Unicode, CUnicode, CBool, Any, Type
 )
 
 from jupyter_core.application import base_flags, base_aliases
@@ -110,7 +110,11 @@ class JupyterConsoleApp(ConnectionFileMixin):
     classes = classes
     flags = Dict(flags)
     aliases = Dict(aliases)
-    kernel_manager_class = KernelManager
+    kernel_manager_class = Type(
+        default_value=KernelManager,
+        config=True,
+        help='The kernel manager class to use.'
+    )
     kernel_client_class = BlockingKernelClient
 
     kernel_argv = List(Unicode())

From f1d8a95bede1d9d5b2ac7af6be702913b51a53fd Mon Sep 17 00:00:00 2001
From: M Pacer <mpacer@berkeley.edu>
Date: Tue, 15 May 2018 13:50:50 -0700
Subject: [PATCH 2/2] Explicitly require a pytest that knows how to yield

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index b6058f856..81b4dd0e9 100644
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ def run(self):
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
     extras_require   = {
         'test': ['ipykernel', 'ipython', 'mock'],
-        'test:python_version == "3.3"': ['pytest<3.3.0'],
+        'test:python_version == "3.3"': ['pytest>=3,<3.3.0'],
         'test:(python_version >= "3.4" or python_version == "2.7")': ['pytest'],
     },
     cmdclass         = {