diff --git a/IPython/zmq/parallel/scripts/__init__.py b/IPython/zmq/parallel/scripts/__init__.py new file mode 100644 index 0000000..4e77672 --- /dev/null +++ b/IPython/zmq/parallel/scripts/__init__.py @@ -0,0 +1,16 @@ +# encoding: utf-8 + +"""""" + +__docformat__ = "restructuredtext en" + +#------------------------------------------------------------------------------- +# Copyright (C) 2008 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Imports +#------------------------------------------------------------------------------- \ No newline at end of file diff --git a/IPython/zmq/parallel/scripts/ipclusterz b/IPython/zmq/parallel/scripts/ipclusterz new file mode 100755 index 0000000..6e4b1f1 --- /dev/null +++ b/IPython/zmq/parallel/scripts/ipclusterz @@ -0,0 +1,18 @@ +#!/usr/bin/env python +# encoding: utf-8 + +#----------------------------------------------------------------------------- +# Copyright (C) 2008-2009 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + +#----------------------------------------------------------------------------- +# Imports +#----------------------------------------------------------------------------- + + +from IPython.zmq.parallel.ipclusterapp import launch_new_instance + +launch_new_instance() diff --git a/IPython/zmq/parallel/scripts/ipcontrollerz b/IPython/zmq/parallel/scripts/ipcontrollerz new file mode 100755 index 0000000..74aeaf5 --- /dev/null +++ b/IPython/zmq/parallel/scripts/ipcontrollerz @@ -0,0 +1,18 @@ +#!/usr/bin/env python +# encoding: utf-8 + +#----------------------------------------------------------------------------- +# Copyright (C) 2008-2009 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + +#----------------------------------------------------------------------------- +# Imports +#----------------------------------------------------------------------------- + + +from IPython.zmq.parallel.ipcontrollerapp import launch_new_instance + +launch_new_instance() diff --git a/IPython/zmq/parallel/scripts/ipenginez b/IPython/zmq/parallel/scripts/ipenginez new file mode 100755 index 0000000..515347f --- /dev/null +++ b/IPython/zmq/parallel/scripts/ipenginez @@ -0,0 +1,20 @@ +#!/usr/bin/env python +# encoding: utf-8 + +#----------------------------------------------------------------------------- +# Copyright (C) 2008-2009 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + +#----------------------------------------------------------------------------- +# Imports +#----------------------------------------------------------------------------- + + +from IPython.zmq.parallel.ipengineapp import launch_new_instance + +launch_new_instance() + + diff --git a/IPython/zmq/parallel/scripts/iploggerz b/IPython/zmq/parallel/scripts/iploggerz new file mode 100755 index 0000000..32e6eed --- /dev/null +++ b/IPython/zmq/parallel/scripts/iploggerz @@ -0,0 +1,20 @@ +#!/usr/bin/env python +# encoding: utf-8 + +#----------------------------------------------------------------------------- +# Copyright (C) 2008-2009 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + +#----------------------------------------------------------------------------- +# Imports +#----------------------------------------------------------------------------- + + +from IPython.zmq.parallel.iploggerapp import launch_new_instance + +launch_new_instance() + + diff --git a/setupbase.py b/setupbase.py index 0cd86a7..c05e6e0 100644 --- a/setupbase.py +++ b/setupbase.py @@ -261,11 +261,12 @@ def find_scripts(): """ Find IPython's scripts. """ - # kernel_scripts = pjoin('IPython','kernel','scripts') + zmq_scripts = pjoin('IPython','zmq','parallel','scripts') main_scripts = pjoin('IPython','scripts') - scripts = [# pjoin(kernel_scripts, 'ipengine'), - # pjoin(kernel_scripts, 'ipcontroller'), - # pjoin(kernel_scripts, 'ipcluster'), + scripts = [pjoin(zmq_scripts, 'ipenginez'), + pjoin(zmq_scripts, 'ipcontrollerz'), + pjoin(zmq_scripts, 'ipclusterz'), + pjoin(zmq_scripts, 'iploggerz'), pjoin(main_scripts, 'ipython'), pjoin(main_scripts, 'ipython-qtconsole'), pjoin(main_scripts, 'pycolor'), @@ -299,7 +300,8 @@ def check_for_dependencies(): from setupext.setupext import ( print_line, print_raw, print_status, check_for_sphinx, check_for_pygments, - check_for_nose, check_for_pexpect + check_for_nose, check_for_pexpect, + check_for_pyzmq ) print_line() print_raw("BUILDING IPYTHON") @@ -315,6 +317,7 @@ def check_for_dependencies(): check_for_pygments() check_for_nose() check_for_pexpect() + check_for_pyzmq() def record_commit_info(pkg_dir, build_cmd=build_py): diff --git a/setupext/setupext.py b/setupext/setupext.py index c600e7f..974b623 100644 --- a/setupext/setupext.py +++ b/setupext/setupext.py @@ -56,16 +56,6 @@ def check_for_ipython(): print_status("IPython", IPython.__version__) return True -def check_for_pyopenssl(): - try: - import OpenSSL - except ImportError: - print_status('OpenSSL', "Not found (required if you want security in the parallel computing capabilities)") - return False - else: - print_status('OpenSSL', OpenSSL.__version__) - return True - def check_for_sphinx(): try: import sphinx @@ -136,4 +126,17 @@ def check_for_simplejson(): print_status("simplejson","yes") return True - \ No newline at end of file +def check_for_pyzmq(): + try: + import zmq + except ImportError: + print_status('pyzmq', "no (required for qtconsole and parallel computing capabilities)") + return False + else: + if zmq.__version__ < '2.0.10': + print_status('pyzmq', "no (require >= 2.0.10 for qtconsole and parallel computing capabilities)") + + else: + print_status("pyzmq", zmq.__version__) + return True +