mirror of
https://github.com/jupyter/notebook.git
synced 2024-12-21 04:10:17 +08:00
Merge pull request #422 from epatters/gui-scripts
Make ipython-qtconsole a GUI script
This commit is contained in:
commit
130f56cf50
4
setup.py
4
setup.py
@ -210,9 +210,7 @@ setuptools_extra_args = {}
|
||||
|
||||
if 'setuptools' in sys.modules:
|
||||
setuptools_extra_args['zip_safe'] = False
|
||||
setuptools_extra_args['entry_points'] = {
|
||||
'console_scripts': find_scripts(True)
|
||||
}
|
||||
setuptools_extra_args['entry_points'] = find_scripts(True)
|
||||
setup_args['extras_require'] = dict(
|
||||
parallel = 'pyzmq>=2.1.4',
|
||||
zmq = 'pyzmq>=2.0.10.1',
|
||||
|
11
setupbase.py
11
setupbase.py
@ -267,12 +267,10 @@ def find_scripts(entry_points=False):
|
||||
return setuptools entry_point-style definitions
|
||||
else:
|
||||
return file paths of plain scripts [default]
|
||||
|
||||
"""
|
||||
if entry_points:
|
||||
scripts = [
|
||||
console_scripts = [
|
||||
'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
|
||||
'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
|
||||
'pycolor = IPython.utils.PyColorize:main',
|
||||
'ipcontroller = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
|
||||
'ipengine = IPython.parallel.apps.ipengineapp:launch_new_instance',
|
||||
@ -281,6 +279,10 @@ def find_scripts(entry_points=False):
|
||||
'iptest = IPython.testing.iptest:main',
|
||||
'irunner = IPython.lib.irunner:main'
|
||||
]
|
||||
gui_scripts = [
|
||||
'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
|
||||
]
|
||||
scripts = dict(console_scripts=console_scripts, gui_scripts=gui_scripts)
|
||||
else:
|
||||
parallel_scripts = pjoin('IPython','parallel','scripts')
|
||||
main_scripts = pjoin('IPython','scripts')
|
||||
@ -294,8 +296,7 @@ def find_scripts(entry_points=False):
|
||||
pjoin(main_scripts, 'pycolor'),
|
||||
pjoin(main_scripts, 'irunner'),
|
||||
pjoin(main_scripts, 'iptest')
|
||||
]
|
||||
|
||||
]
|
||||
return scripts
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user