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

rebase IPython.parallel after removal of IPython.kernel

Browse Source 
This commit removes all '*z' suffixes from scripts and docs,
as there is no longer conflict with IPython.kernel.
This commit is contained in:
MinRK 2011-04-06 14:54:33 -07:00
parent 8c38900f2b
commit 587b10631a
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IPython/testing/iptest.py
View File

@ -185,6 +185,7 @@ def make_exclude():
if not have['zmq']:
exclusions.append(ipjoin('zmq'))
exclusions.append(ipjoin('parallel'))
# This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
if sys.platform == 'win32':

10
setup.py
View File

@ -215,16 +215,16 @@ 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.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',
'ipcontroller = IPython.parallel.ipcontrollerapp:launch_new_instance',
'ipengine = IPython.parallel.ipengineapp:launch_new_instance',
'iplogger = IPython.parallel.iploggerapp:launch_new_instance',
'ipcluster = IPython.parallel.ipclusterapp:launch_new_instance',
'iptest = IPython.testing.iptest:main',
'irunner = IPython.lib.irunner:main'
]
}
setup_args['extras_require'] = dict(
zmq = 'pyzmq>=2.0.10',
zmq = 'pyzmq>=2.0.10.1',
doc='Sphinx>=0.3',
test='nose>=0.10.1',
security='pyOpenSSL>=0.6'

10
setupbase.py
View File

@ -127,6 +127,7 @@ def find_packages():
add_package(packages, 'frontend.qt.console', tests=True)
add_package(packages, 'frontend.terminal', tests=True)
add_package(packages, 'lib', tests=True)
add_package(packages, 'parallel', tests=True)
add_package(packages, 'quarantine', tests=True)
add_package(packages, 'scripts')
add_package(packages, 'testing', tests=True)
@ -134,7 +135,6 @@ def find_packages():
add_package(packages, 'utils', tests=True)
add_package(packages, 'zmq')
add_package(packages, 'zmq.pylab')
add_package(packages, 'parallel')
return packages
#---------------------------------------------------------------------------
@ -265,10 +265,10 @@ def find_scripts():
parallel_scripts = pjoin('IPython','parallel','scripts')
main_scripts = pjoin('IPython','scripts')
scripts = [
pjoin(parallel_scripts, 'ipenginez'),
pjoin(parallel_scripts, 'ipcontrollerz'),
pjoin(parallel_scripts, 'ipclusterz'),
pjoin(parallel_scripts, 'iploggerz'),
pjoin(parallel_scripts, 'ipengine'),
pjoin(parallel_scripts, 'ipcontroller'),
pjoin(parallel_scripts, 'ipcluster'),
pjoin(parallel_scripts, 'iplogger'),
pjoin(main_scripts, 'ipython'),
pjoin(main_scripts, 'ipython-qtconsole'),
pjoin(main_scripts, 'pycolor'),