##// END OF EJS Templates
remove qtconsole
Min RK -
Show More
@@ -124,7 +124,6 b" have['numpy'] = test_for('numpy')"
124 have['pexpect'] = test_for('pexpect')
124 have['pexpect'] = test_for('pexpect')
125 have['pymongo'] = test_for('pymongo')
125 have['pymongo'] = test_for('pymongo')
126 have['pygments'] = test_for('pygments')
126 have['pygments'] = test_for('pygments')
127 have['qt'] = test_for('IPython.external.qt')
128 have['sqlite3'] = test_for('sqlite3')
127 have['sqlite3'] = test_for('sqlite3')
129 have['tornado'] = test_for('tornado.version_info', (4,0), callback=None)
128 have['tornado'] = test_for('tornado.version_info', (4,0), callback=None)
130 have['jinja2'] = test_for('jinja2')
129 have['jinja2'] = test_for('jinja2')
@@ -147,7 +146,7 b" have['zmq'] = test_for('zmq.pyzmq_version_info', min_zmq, callback=lambda x: x()"
147
146
148 test_group_names = ['core',
147 test_group_names = ['core',
149 'extensions', 'lib', 'terminal', 'testing', 'utils',
148 'extensions', 'lib', 'terminal', 'testing', 'utils',
150 'qt', 'html', 'nbconvert'
149 'html', 'nbconvert'
151 ]
150 ]
152
151
153 class TestSection(object):
152 class TestSection(object):
@@ -227,9 +226,6 b" test_sections['autoreload'] = TestSection('autoreload',"
227 ['IPython.extensions.autoreload', 'IPython.extensions.tests.test_autoreload'])
226 ['IPython.extensions.autoreload', 'IPython.extensions.tests.test_autoreload'])
228 test_group_names.append('autoreload')
227 test_group_names.append('autoreload')
229
228
230 # qt:
231 test_sections['qt'].requires('zmq', 'qt', 'pygments')
232
233 # html:
229 # html:
234 sec = test_sections['html']
230 sec = test_sections['html']
235 sec.requires('zmq', 'tornado', 'requests', 'sqlite3', 'jsonschema')
231 sec.requires('zmq', 'tornado', 'requests', 'sqlite3', 'jsonschema')
@@ -9,11 +9,9 b' graft scripts'
9
9
10 # Load main dir but exclude things we don't want in the distro
10 # Load main dir but exclude things we don't want in the distro
11 graft IPython
11 graft IPython
12 prune IPython/html/static/mathjax
13
12
14 # Include some specific files and data resources we need
13 # Include some specific files and data resources we need
15 include IPython/.git_commit_info.ini
14 include IPython/.git_commit_info.ini
16 include IPython/qt/console/resources/icon/IPythonConsole.svg
17
15
18 # Documentation
16 # Documentation
19 graft docs
17 graft docs
@@ -102,8 +102,6 b' def install():'
102 arguments(scripts, 'ipython'), iconpath)
102 arguments(scripts, 'ipython'), iconpath)
103 mkshortcut(python, 'IPython (pylab mode)', ip_start_menu,
103 mkshortcut(python, 'IPython (pylab mode)', ip_start_menu,
104 arguments(scripts, 'ipython', '--pylab'), iconpath)
104 arguments(scripts, 'ipython', '--pylab'), iconpath)
105 mkshortcut(pythonw, 'IPython Qt Console', ip_start_menu,
106 arguments(scripts, 'ipython', 'qtconsole'), iconpath)
107
105
108 iconpath = pjoin(scripts, 'ipython_nb.ico')
106 iconpath = pjoin(scripts, 'ipython_nb.ico')
109 mkshortcut(python, 'IPython Notebook', ip_start_menu,
107 mkshortcut(python, 'IPython Notebook', ip_start_menu,
@@ -248,7 +248,7 b" pyzmq = 'pyzmq>=13'"
248
248
249 extras_require = dict(
249 extras_require = dict(
250 parallel = ['ipython_parallel'],
250 parallel = ['ipython_parallel'],
251 qtconsole = [pyzmq, 'pygments'],
251 qtconsole = ['jupyter_qtconsole'],
252 doc = ['Sphinx>=1.1', 'numpydoc'],
252 doc = ['Sphinx>=1.1', 'numpydoc'],
253 test = ['nose>=0.10.1', 'requests'],
253 test = ['nose>=0.10.1', 'requests'],
254 terminal = [],
254 terminal = [],
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (2167 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (811 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (594 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (928 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (569 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now