Skip to content
Browse files

remove IPython.kernel scripts and put migration notice in docs.

closes gh-325
  • Loading branch information...
1 parent bea5104 commit 627e381cc734a2668df019cd6d70a56f6a2358ed @minrk minrk committed
Showing with 22 additions and 14 deletions.
  1. +1 −1 IPython/utils/notification.py
  2. +1 −0 docs/source/index.txt
  3. +12 −0 docs/source/parallel/index.txt
  4. +3 −3 setup.py
  5. +5 −10 setupbase.py
View
2 IPython/utils/notification.py
@@ -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
View
1 docs/source/index.txt
@@ -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
View
12 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>`_.
View
6 setup.py
@@ -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'
]
View
15 setupbase.py
@@ -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)
@@ -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'),
@@ -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
)
@@ -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()

0 comments on commit 627e381

Please sign in to comment.
Something went wrong with that request. Please try again.