Merge pull request #8301 from minrk/rm-qtconsole

remove qtconsole

.travis.yml

@@ -21,7 +21,7 b' 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:

IPython/testing/iptest.py

@@ -124,7 +124,6 b" 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 b" 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 b" 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')

MANIFEST.in

@@ -9,11 +9,9 b' graft scripts'
 
 # Load main dir but exclude things we don't want in the distro
 graft IPython
-prune IPython/html/static/mathjax
 
 # Include some specific files and data resources we need
 include IPython/.git_commit_info.ini
-include IPython/qt/console/resources/icon/IPythonConsole.svg
 
 # Documentation
 graft docs

requirements.txt

@@ -7,4 +7,3 b''
 -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

scripts/ipython_win_post_install.py

@@ -102,8 +102,6 b' def install():'
                arguments(scripts, 'ipython'), iconpath)
     mkshortcut(python, 'IPython (pylab mode)', ip_start_menu,
                arguments(scripts, 'ipython', '--pylab'), iconpath)
-    mkshortcut(pythonw, 'IPython Qt Console', ip_start_menu,
-               arguments(scripts, 'ipython', 'qtconsole'), iconpath)
 
     iconpath = pjoin(scripts, 'ipython_nb.ico')
     mkshortcut(python, 'IPython Notebook', ip_start_menu,

setup.py

@@ -248,10 +248,11 b" 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 = [],
+    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 b" 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',