From 2b4ab756abb96c70b186a9329cb552303313b47d Mon Sep 17 00:00:00 2001 From: MinRK Date: Thu, 31 Mar 2011 16:27:32 -0700 Subject: [PATCH] move IPython.zmq.parallel to IPython.parallel --- setup.py | 8 ++++---- setupbase.py | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 2450384ed..13ec6aa08 100755 --- a/setup.py +++ b/setup.py @@ -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' ] diff --git a/setupbase.py b/setupbase.py index c05e6e07a..8a2289f1d 100644 --- a/setupbase.py +++ b/setupbase.py @@ -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'),