Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
add scripts for non-setuptools install of zmq.parallel
  • Loading branch information
minrk committed Apr 8, 2011
1 parent b6802e2 commit 02c97fe
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 16 deletions.
16 changes: 16 additions & 0 deletions 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
#-------------------------------------------------------------------------------
18 changes: 18 additions & 0 deletions 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()
18 changes: 18 additions & 0 deletions 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()
20 changes: 20 additions & 0 deletions 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()


20 changes: 20 additions & 0 deletions 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()


13 changes: 8 additions & 5 deletions setupbase.py
Expand Up @@ -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'),
Expand Down Expand Up @@ -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")
Expand All @@ -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):
Expand Down
25 changes: 14 additions & 11 deletions setupext/setupext.py
Expand Up @@ -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
Expand Down Expand Up @@ -136,4 +126,17 @@ def check_for_simplejson():
print_status("simplejson","yes")
return True


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

0 comments on commit 02c97fe

Please sign in to comment.