Skip to content

Commit

Permalink
remove IPython.kernel scripts and put migration notice in docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
minrk committed Apr 6, 2011
1 parent 9fd6af8 commit 5addbcb
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 14 deletions.
2 changes: 1 addition & 1 deletion IPython/utils/notification.py
Expand Up @@ -35,7 +35,7 @@ class NotificationCenter(object):
--------
Here is a simple example of how to use this::
import IPython.kernel.core.notification as notification
import IPython.util.notification as notification
def callback(ntype, theSender, args={}):
print ntype,theSender,args
Expand Down
1 change: 1 addition & 0 deletions docs/source/index.txt
Expand Up @@ -19,6 +19,7 @@ Contents
whatsnew/index.txt
install/index.txt
interactive/index.txt
parallel/index.txt
config/index.txt
development/index.txt
api/index.txt
Expand Down
12 changes: 12 additions & 0 deletions docs/source/parallel/index.txt
@@ -0,0 +1,12 @@
.. _parallel_index:

====================================
Using IPython for parallel computing
====================================

The twisted-based :mod:`IPython.kernel` has been removed, in favor of
the new 0MQ-based :mod:`IPython.parallel`, whose merge into master is imminent.

Until that code is merged, it can be found in the `newparallel branch
<https://github.com/ipython/ipython/tree/newparallel>`_, and its draft documentation can be
found `here <http://minrk.github.com/ipython-doc/newparallel>`_.
6 changes: 3 additions & 3 deletions setup.py
Expand Up @@ -215,9 +215,9 @@ def cleanup():
'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
'pycolor = IPython.utils.PyColorize:main',
'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance',
'ipengine = IPython.kernel.ipengineapp:launch_new_instance',
'ipcluster = IPython.kernel.ipclusterapp:launch_new_instance',
# 'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance',
# 'ipengine = IPython.kernel.ipengineapp:launch_new_instance',
# 'ipcluster = IPython.kernel.ipclusterapp:launch_new_instance',
'iptest = IPython.testing.iptest:main',
'irunner = IPython.lib.irunner:main'
]
Expand Down
15 changes: 5 additions & 10 deletions setupbase.py
Expand Up @@ -120,6 +120,7 @@ def find_packages():
add_package(packages, 'external.pyparsing')
add_package(packages, 'external.simplegeneric')
add_package(packages, 'external.validate')
add_package(packages, 'kernel')
add_package(packages, 'frontend')
add_package(packages, 'frontend.qt')
add_package(packages, 'frontend.qt.console', tests=True)
Expand Down Expand Up @@ -259,11 +260,11 @@ def find_scripts():
"""
Find IPython's scripts.
"""
kernel_scripts = pjoin('IPython','kernel','scripts')
# kernel_scripts = pjoin('IPython','kernel','scripts')
main_scripts = pjoin('IPython','scripts')
scripts = [pjoin(kernel_scripts, 'ipengine'),
pjoin(kernel_scripts, 'ipcontroller'),
pjoin(kernel_scripts, 'ipcluster'),
scripts = [# pjoin(kernel_scripts, 'ipengine'),
# pjoin(kernel_scripts, 'ipcontroller'),
# pjoin(kernel_scripts, 'ipcluster'),
pjoin(main_scripts, 'ipython'),
pjoin(main_scripts, 'ipython-qtconsole'),
pjoin(main_scripts, 'pycolor'),
Expand Down Expand Up @@ -296,8 +297,6 @@ def check_for_dependencies():
"""
from setupext.setupext import (
print_line, print_raw, print_status,
check_for_zopeinterface, check_for_twisted,
check_for_foolscap, check_for_pyopenssl,
check_for_sphinx, check_for_pygments,
check_for_nose, check_for_pexpect
)
Expand All @@ -311,10 +310,6 @@ def check_for_dependencies():
print_raw("")
print_raw("OPTIONAL DEPENDENCIES")

check_for_zopeinterface()
check_for_twisted()
check_for_foolscap()
check_for_pyopenssl()
check_for_sphinx()
check_for_pygments()
check_for_nose()
Expand Down

0 comments on commit 5addbcb

Please sign in to comment.