From aa4457318156d2464906ee77a214f04f66ef0535 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Thu, 9 Apr 2015 16:12:25 -0700
Subject: [PATCH 1/2] remove qtconsole

---
 IPython/testing/iptest.py | 6 +-----
 setup.py                  | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index eee3a5cd0..b64da0b80 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -124,7 +124,6 @@ have['numpy'] = test_for('numpy')
 have['pexpect'] = test_for('pexpect')
 have['pymongo'] = test_for('pymongo')
 have['pygments'] = test_for('pygments')
-have['qt'] = test_for('IPython.external.qt')
 have['sqlite3'] = test_for('sqlite3')
 have['tornado'] = test_for('tornado.version_info', (4,0), callback=None)
 have['jinja2'] = test_for('jinja2')
@@ -147,7 +146,7 @@ have['zmq'] = test_for('zmq.pyzmq_version_info', min_zmq, callback=lambda x: x()
 
 test_group_names = ['core',
                     'extensions', 'lib', 'terminal', 'testing', 'utils',
-                    'qt', 'html', 'nbconvert'
+                    'html', 'nbconvert'
                    ]
 
 class TestSection(object):
@@ -227,9 +226,6 @@ test_sections['autoreload'] = TestSection('autoreload',
         ['IPython.extensions.autoreload', 'IPython.extensions.tests.test_autoreload'])
 test_group_names.append('autoreload')
 
-# qt:
-test_sections['qt'].requires('zmq', 'qt', 'pygments')
-
 # html:
 sec = test_sections['html']
 sec.requires('zmq', 'tornado', 'requests', 'sqlite3', 'jsonschema')
diff --git a/setup.py b/setup.py
index c951b3218..11b51d5dd 100755
--- a/setup.py
+++ b/setup.py
@@ -248,7 +248,7 @@ pyzmq = 'pyzmq>=13'
 
 extras_require = dict(
     parallel = ['ipython_parallel'],
-    qtconsole = [pyzmq, 'pygments'],
+    qtconsole = ['jupyter_qtconsole'],
     doc = ['Sphinx>=1.1', 'numpydoc'],
     test = ['nose>=0.10.1', 'requests'],
     terminal = [],

From 402bd06c4114878521dd80d48b339aacbe236d6c Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Thu, 9 Apr 2015 19:39:24 -0700
Subject: [PATCH 2/2] add ipython[kernel]

which depends on ipython_kernel

removing the need to install 'all' on travis
---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 11b51d5dd..7be7a6927 100755
--- a/setup.py
+++ b/setup.py
@@ -252,6 +252,7 @@ extras_require = dict(
     doc = ['Sphinx>=1.1', 'numpydoc'],
     test = ['nose>=0.10.1', 'requests'],
     terminal = [],
+    kernel = ['ipython_kernel'],
     nbformat = ['jupyter_nbformat'],
     notebook = ['tornado>=4.0', pyzmq, 'jinja2', 'pygments', 'mistune>=0.5'],
     nbconvert = ['pygments', 'jinja2', 'mistune>=0.3.1']
@@ -263,8 +264,9 @@ if not sys.platform.startswith('win'):
 if sys.version_info < (3, 3):
     extras_require['test'].append('mock')
 
-extras_require['notebook'].extend(extras_require['nbformat'])
 extras_require['nbconvert'].extend(extras_require['nbformat'])
+extras_require['notebook'].extend(extras_require['kernel'])
+extras_require['notebook'].extend(extras_require['nbconvert'])
 
 install_requires = [
     'decorator',