Merge pull request #379 from mpacer/config_kernel_manager

make KernelManager configurable for all who inherit JupyterConsoleApp

Author: Carreau

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())

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         = {