mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

move IPython.zmq.parallel to IPython.parallel

Browse Source
This commit is contained in:
MinRK 2011-03-31 16:27:32 -07:00
parent 5dfb26377f
commit 2b4ab756ab
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup.py
View File

@ -215,10 +215,10 @@ if 'setuptools' in sys.modules:
'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
'pycolor = IPython.utils.PyColorize:main',
'ipcontrollerz = IPython.zmq.parallel.ipcontrollerapp:launch_new_instance',
'ipenginez = IPython.zmq.parallel.ipengineapp:launch_new_instance',
'iploggerz = IPython.zmq.parallel.iploggerapp:launch_new_instance',
'ipclusterz = IPython.zmq.parallel.ipclusterapp:launch_new_instance',
'ipcontrollerz = IPython.parallel.ipcontrollerapp:launch_new_instance',
'ipenginez = IPython.parallel.ipengineapp:launch_new_instance',
'iploggerz = IPython.parallel.iploggerapp:launch_new_instance',
'ipclusterz = IPython.parallel.ipclusterapp:launch_new_instance',
'iptest = IPython.testing.iptest:main',
'irunner = IPython.lib.irunner:main'
]

13
setupbase.py
View File

@ -132,8 +132,8 @@ def find_packages():
add_package(packages, 'testing.plugin', tests=False)
add_package(packages, 'utils', tests=True)
add_package(packages, 'zmq')
add_package(packages, 'zmq.parallel')
add_package(packages, 'zmq.pylab')
add_package(packages, 'parallel')
return packages
#---------------------------------------------------------------------------
@ -261,12 +261,13 @@ def find_scripts():
"""
Find IPython's scripts.
"""
zmq_scripts = pjoin('IPython','zmq','parallel','scripts')
parallel_scripts = pjoin('IPython','parallel','scripts')
main_scripts = pjoin('IPython','scripts')
scripts = [pjoin(zmq_scripts, 'ipenginez'),
pjoin(zmq_scripts, 'ipcontrollerz'),
pjoin(zmq_scripts, 'ipclusterz'),
pjoin(zmq_scripts, 'iploggerz'),
scripts = [
pjoin(parallel_scripts, 'ipenginez'),
pjoin(parallel_scripts, 'ipcontrollerz'),
pjoin(parallel_scripts, 'ipclusterz'),
pjoin(parallel_scripts, 'iploggerz'),
pjoin(main_scripts, 'ipython'),
pjoin(main_scripts, 'ipython-qtconsole'),
pjoin(main_scripts, 'pycolor'),