From b84c3f0cd6f40aabae6981d92fdf2a1806058ed8 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Wed, 6 Apr 2011 21:34:12 -0700
Subject: [PATCH] organize IPython.parallel into subpackages

---
 IPython/testing/iptest.py |  5 ++++-
 setup.py                  | 10 +++++-----
 setupbase.py              |  3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index 9d005711a..9b702140b 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -282,7 +282,10 @@ def make_runners():
     # Packages to be tested via nose, that only depend on the stdlib
     nose_pkg_names = ['config', 'core', 'extensions', 'frontend', 'lib',
                      'scripts', 'testing', 'utils' ]
-
+    
+    if have['zmq']:
+        nose_pkg_names.append('parallel')
+    
     # For debugging this code, only load quick stuff
     #nose_pkg_names = ['core', 'extensions']  # dbg
 
diff --git a/setup.py b/setup.py
index c928ab827..ace1149b5 100755
--- a/setup.py
+++ b/setup.py
@@ -215,19 +215,19 @@ 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',
-            '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',
+            'ipcontroller = IPython.parallel.apps.ipcontrollerapp:launch_new_instance',
+            'ipengine = IPython.parallel.apps.ipengineapp:launch_new_instance',
+            'iplogger = IPython.parallel.apps.iploggerapp:launch_new_instance',
+            'ipcluster = IPython.parallel.apps.ipclusterapp:launch_new_instance',
             'iptest = IPython.testing.iptest:main',
             'irunner = IPython.lib.irunner:main'
         ]
     }
     setup_args['extras_require'] = dict(
+        parallel = 'pyzmq>=2.1.4',
         zmq = 'pyzmq>=2.0.10.1',
         doc='Sphinx>=0.3',
         test='nose>=0.10.1',
-        security='pyOpenSSL>=0.6'
     )
 else:
     # If we are running without setuptools, call this function which will
diff --git a/setupbase.py b/setupbase.py
index 683a3a65b..6ebdfc098 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -127,7 +127,8 @@ 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, 'parallel', tests=True, scripts=True, 
+                                    others=['apps','engine','client','controller'])
     add_package(packages, 'quarantine', tests=True)
     add_package(packages, 'scripts')
     add_package(packages, 'testing', tests=True)