From d9347d5b4e8107c814d5789205bd3b1a8e88197c 2015-04-10 02:39:24
From: Min RK <benjaminrk@gmail.com>
Date: 2015-04-10 02:39:24
Subject: [PATCH] add ipython[kernel]

which depends on ipython_kernel

removing the need to install 'all' on travis
---

diff --git a/.travis.yml b/.travis.yml
index 1368359..03b2936 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ before_install:
     - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
     - 'if [[ $GROUP != js* ]]; then COVERAGE="--coverage xml"; fi'
 install:
-    - pip install -f travis-wheels/wheelhouse -r requirements.txt -e file://$PWD#egg=ipython[all] coveralls
+    - pip install -f travis-wheels/wheelhouse -r requirements.txt -e file://$PWD#egg=ipython[test,notebook] coveralls
 before_script:
     - 'if [[ $GROUP == js* ]]; then python -m IPython.external.mathjax mathjax.zip; fi'
 script:
diff --git a/requirements.txt b/requirements.txt
index 8ed0fa7..1967c41 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,4 +7,3 @@
 -e git+https://github.com/jupyter/jupyter_nbformat.git#egg=jupyter_nbformat
 -e git+https://github.com/jupyter/jupyter_client.git#egg=jupyter_client
 -e git+https://github.com/ipython/ipython_kernel.git#egg=ipython_kernel
--e git+https://github.com/ipython/ipython_parallel.git#egg=ipython_parallel
diff --git a/setup.py b/setup.py
index 11b51d5..7be7a69 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',