Merge pull request #4846 from takluyver/irunner-vestiges

Remove some leftover traces of irunner

docs/source/install/install.rst

@@ -1,449 +1,433 b''
 IPython requires Python 2.7 or ≥ 3.3.
 
 .. note::
 
     If you need to use Python 2.6 or 3.2, you can find IPython 1.0
     `here <http://archive.ipython.org/release/>`__.
 
 Quickstart
 ==========
 
 If you have :mod:`setuptools`,
 the quickest way to get up and running with IPython is:
 
 .. code-block:: bash
 
     $ easy_install ipython[all]
 
 This will download and install IPython and its main optional dependencies:
 
 - jinja2, needed for the notebook
 - sphinx, needed for nbconvert
 - pyzmq, needed for IPython's parallel computing features, qt console and
   notebook
 - pygments, used by nbconvert and the Qt console for syntax highlighting
 - tornado, needed by the web-based notebook
 - nose, used by the test suite
 - readline (on OS X) or pyreadline (on Windows), needed for the terminal
 
 To run IPython's test suite, use the :command:`iptest` command:
 
 .. code-block:: bash
 
     $ iptest
 
 .. note::
 
     .. code-block:: bash
 
         $ pip install ipython[all]
     
     will also work in many cases, but it will ignore the binary eggs
     of packages such as pyzmq and readline,
     which may be required for some users on Windows or OS X.
 
 
 Overview
 ========
 
 This document describes in detail the steps required to install IPython,
 and its various optional dependencies.
 For a few quick ways to get started with package managers or full Python distributions,
 see `the install page <http://ipython.org/install.html>`_ of the IPython website.
 
 IPython is organized into a number of subpackages, each of which has its own dependencies.
 All of the subpackages come with IPython, so you don't need to download and
 install them separately.  However, to use a given subpackage, you will need to
 install all of its dependencies.
 
 Please let us know if you have problems installing IPython or any of its dependencies.
 
 IPython and most dependencies can be installed via :command:`easy_install`,
 provided by the :mod:`setuptools` package, or :command:`pip`.
 In many scenarios, this is the most simplest method of installing Python packages.
 More information about :mod:`setuptools` can be found on
 `its PyPI page <http://pypi.python.org/pypi/setuptools>`__.
 
 .. note::
 
    On Windows, IPython *requires* :mod:`setuptools`.  We hope to
    change this in the future, but for now on Windows, you *must* install
    :mod:`setuptools` to use IPython.
 
 More general information about installing Python packages can be found in
 `Python's documentation <http://docs.python.org>`_.
 
 
 Installing IPython itself
 =========================
 
 Given a properly built Python, the basic interactive IPython shell will work
 with no external dependencies.  However, some Python distributions
 (particularly on Windows and OS X), don't come with a working :mod:`readline`
 module.  The IPython shell will work without :mod:`readline`, but will lack
 many features that users depend on, such as tab completion and command line
 editing.  If you install IPython with :mod:`setuptools`, (e.g. with
 `easy_install`), then the appropriate :mod:`readline` for your platform will be
 installed.  See below for details of how to make sure you have a working
 :mod:`readline`.
 
 Installation using easy_install or pip
 --------------------------------------
 
 If you have :mod:`setuptools` or :mod:`pip`, the easiest way of getting IPython is
 to simply use :command:`easy_install` or :command:`pip`:
 
 .. code-block:: bash
 
     $ pip install ipython
 
 That's it.
 
 .. note::
 
     Many prefer :command:`pip` to :command:`easy_install`, but it ignores eggs (binary Python packages).
     This mainly affects pyzmq and readline, which are compiled packages and provide
     binary eggs.  If you use :command:`pip` to install these packages,
     it will always compile from source, which may not succeed.
 
 Installation from source
 ------------------------
 
 If you don't want to use :command:`easy_install`, or don't have it installed,
 just grab the latest stable build of IPython from `here
 <http://ipython.org/download.html>`_.  Then do the following:
 
 .. code-block:: bash
 
     $ tar -xzf ipython.tar.gz
     $ cd ipython
     $ python setup.py install
 
 If you are installing to a location (like ``/usr/local``) that requires higher
 permissions, you may need to run the last command with :command:`sudo`.
 
 Windows
 -------
 
 As mentioned above, on Windows, IPython requires :mod:`setuptools`, and it also
 requires the PyReadline library to properly support coloring and keyboard
 management (features that the default windows console doesn't have).  So on
 Windows, the installation procedure is:
 
 1. Install `setuptools <http://pypi.python.org/pypi/setuptools>`_.
 
 2. Install `pyreadline <http://pypi.python.org/pypi/pyreadline>`_.  You can use
    the command ``easy_install pyreadline`` from a terminal, or the binary
    installer appropriate for your platform from the PyPI page.
 
 3. Install IPython itself, which you can download from `PyPI
    <http://pypi.python.org/pypi/ipython>`_ or from `our site
    <http://ipython.org/download.html>`_.  Note that on Windows 7, you *must*
    right-click and 'Run as administrator' for the Start menu shortcuts to be
    created.
 
 IPython by default runs in a terminal window, but the normal terminal
 application supplied by Microsoft Windows is very primitive.  You may want to
 download the excellent and free Console_ application instead, which is a far
 superior tool.  You can even configure Console to give you by default an
 IPython tab, which is very convenient to create new IPython sessions directly
 from the working terminal.
 
 .. _Console:  http://sourceforge.net/projects/console
 
    
 Installing the development version
 ----------------------------------
 
 It is also possible to install the development version of IPython from our
 `Git <http://git-scm.com/>`_ source code repository.  To do this you will
 need to have Git installed on your system.  Then just do:
 
 .. code-block:: bash
 
     $ git clone --recursive https://github.com/ipython/ipython.git
     $ cd ipython
     $ python setup.py install
 
 Some users want to be able to follow the development branch as it changes.  If
 you have :mod:`setuptools` installed, this is easy. Simply replace the last
 step by:
 
 .. code-block:: bash
 
     $ python setupegg.py develop
 
 This creates links in the right places and installs the command line script to
 the appropriate places.  Then, if you want to update your IPython at any time,
 just do:
 
 .. code-block:: bash
 
     $ git pull
 
 
 Basic optional dependencies
 ===========================
 
 There are a number of basic optional dependencies that most users will want to
 get.  These are:
 
 * readline (for command line editing, tab completion, etc.)
 * nose (to run the IPython test suite)
-* pexpect (to use things like irunner)
 
 If you are comfortable installing these things yourself, have at it, otherwise
 read on for more details.
 
+IPython uses several other modules, such as pexpect_ and path.py, if they are
+installed on your system, but it can also use bundled versions from
+:mod:`IPython.external`, so there's no need to install them separately.
+
 readline
 --------
 
 As indicated above, on Windows, to get full functionality in the console
 version of IPython, PyReadline is needed.
 PyReadline is a separate, Windows only implementation of readline that uses
 native Windows calls through :mod:`ctypes`. The easiest way of installing
 PyReadline is you use the binary installer available `here
 <http://pypi.python.org/pypi/pyreadline>`__.
 
 On OSX, if you are using the built-in Python shipped by Apple, you will be
 missing a full readline implementation as Apple ships instead a library called
 ``libedit`` that provides only some of readline's functionality.  While you may
 find libedit sufficient, we have occasional reports of bugs with it and several
 developers who use OS X as their main environment consider libedit unacceptable
 for productive, regular use with IPython.
 
 Therefore, we *strongly* recommend that on OS X you get the full
 :mod:`readline` module.  We will *not* consider completion/history problems to
 be bugs for IPython if you are using libedit.
 
 To get a working :mod:`readline` module, just do (with :mod:`setuptools`
 installed):
 
 .. code-block:: bash
 
     $ easy_install readline
 
 .. note::
 
     Other Python distributions on OS X (such as fink, MacPorts and the official
     python.org binaries) already have readline installed so you likely don't
     have to do this step.
 
 When IPython is installed with :mod:`setuptools`, (e.g. using the
 ``easy_install`` command), readline is added as a dependency on OS X, and
 PyReadline on Windows, and will be installed on your system.  However, if you
 do not use setuptools, you may have to install one of these packages yourself.
 
 
 nose
 ----
 
 To run the IPython test suite you will need the :mod:`nose` package.  Nose
 provides a great way of sniffing out and running all of the IPython tests.  The
 simplest way of getting nose is to use :command:`easy_install` or :command:`pip`:
 
 .. code-block:: bash
 
     $ pip install nose
 
 Another way of getting this is to do:
 
 .. code-block:: bash
 
     $ pip install ipython[test]
 
 For more installation options, see the `nose website
 <http://somethingaboutorange.com/mrl/projects/nose/>`_.  
 
 Once you have nose installed, you can run IPython's test suite using the
 iptest command:
 
 .. code-block:: bash
 
     $ iptest
 
-pexpect
--------
-
-The pexpect_ package is used in IPython's :command:`irunner` script, as well as
-for managing subprocesses. IPython now includes a version of pexpect in
-:mod:`IPython.external`, but if you have installed pexpect, IPython will use
-that instead. On Unix platforms (including OS X), just do:
-
-.. code-block:: bash
-
-    $ pip install pexpect
-    
-.. note::
-
-    On Python 3, you should actually install :mod:`pexpect-u`,
-    a unicode-safe fork of pexpect.
-
-Windows users are out of luck as pexpect does not run there.
-
 Dependencies for IPython.parallel (parallel computing)
 ======================================================
 
 IPython.parallel provides a nice architecture for parallel computing, with a
 focus on fluid interactive workflows.  These features require just one package:
 PyZMQ.  See the next section for PyZMQ details.
 
 On a Unix style platform (including OS X), if you want to use
 :mod:`setuptools`, you can just do:
 
 .. code-block:: bash
 
     $ easy_install ipython[zmq]    # will include pyzmq
 
 Security in IPython.parallel is provided by SSH tunnels.  By default, Linux
 and OSX clients will use the shell ssh command, but on Windows, we also
 support tunneling with paramiko_.
 
 Dependencies for IPython.kernel.zmq
 ===================================
 
 pyzmq
 -----
 
 IPython 0.11 introduced some new functionality, including a two-process
 execution model using ZeroMQ_ for communication. The Python bindings to ZeroMQ
 are found in the PyZMQ_ project, which is easy_install-able once you have
 ZeroMQ installed.  If you are on Python 2.6 or 2.7 on OSX, or 2.7 on Windows,
 pyzmq has eggs that include ZeroMQ itself.
 
 IPython.kernel.zmq depends on pyzmq >= 2.1.4.
 
 Dependencies for the IPython QT console
 =======================================
 
 pyzmq
 -----
 
 Like the :mod:`IPython.parallel` package, the QT Console requires ZeroMQ and
 PyZMQ.
 
 Qt
 --
 
 Also with 0.11, a new GUI was added using the work in :mod:`IPython.kernel.zmq`, which
 can be launched with ``ipython qtconsole``. The GUI is built on Qt, and works
 with either PyQt, which can be installed from the `PyQt website
 <http://www.riverbankcomputing.co.uk/>`_, or `PySide
 <http://www.pyside.org/>`_, from Nokia.
 
 pygments
 --------
 
 The syntax-highlighting in ``ipython qtconsole`` is done with the pygments_
 project, which is easy_install-able.
 
 .. _installnotebook:
 
 Dependencies for the IPython HTML notebook
 ==========================================
 
 The IPython notebook is a notebook-style web interface to IPython and can be
 started with the command ``ipython notebook``.
 
 pyzmq
 -----
 
 Like the :mod:`IPython.parallel` and :mod:`IPython.frontend.qt.console`
 packages, the HTML notebook requires ZeroMQ and PyZMQ.
 
 Tornado
 -------
 
 The IPython notebook uses the Tornado_ project for its HTTP server.  Tornado 2.1
 is required, in order to support current versions of browsers, due to an update
 to the websocket protocol.
 
 Jinja
 -----
 
 The IPython notebook uses the Jinja_ templating tool to render HTML pages.
 
 
 MathJax
 -------
 
 The IPython notebook uses the MathJax_ Javascript library for rendering LaTeX
 in web browsers. Because MathJax is large, we don't include it with
 IPython. Normally IPython will load MathJax from a CDN, but if you have a slow
 network connection, or want to use LaTeX without an internet connection at all,
 you can install MathJax locally.
 
 A quick and easy method is to install it from a python session::
 
     from IPython.external.mathjax import install_mathjax
     install_mathjax()
 
 If you need tighter configuration control, you can download your own copy
 of MathJax from http://www.mathjax.org/download/ - use the MathJax-2.0 link.
 When you have the file stored locally, install it with::
 
 	python -m IPython.external.mathjax /path/to/source/mathjax-MathJax-v2.0-20-g07669ac.zip
 
 For unusual needs, IPython can tell you what directory it wants to find MathJax in::
 
 	python -m IPython.external.mathjax -d /some/other/mathjax
 
 By default Mathjax will be installed in your ipython profile directory, but you
 can make system wide install, please refer to the documentation and helper function 
 of :mod:`IPython.external.mathjax`
 
 Browser Compatibility
 ---------------------
 
 The IPython notebook is officially supported on the following browers:
 
 * Chrome ≥ 13
 * Safari ≥ 5
 * Firefox ≥ 6
 
 The is mainly due to the notebook's usage of WebSockets and the flexible box model.
 
 The following browsers are unsupported:
 
 * Safari < 5
 * Firefox < 6
 * Chrome < 13
 * Opera (any): CSS issues, but execution might work
 * Internet Explorer < 10
 
 The following specific combinations are known **NOT** to work:
 
 * Safari, IPython 0.12, tornado ≥ 2.2.0
 * Safari with HTTPS connection to notebook and an untrusted certificate (websockets will fail)
 * The [diigo Chrome extension](http://help.diigo.com/tools/chrome-extension) seems to interfere with scrolling
 
 There are some early reports that the Notebook works on Internet Explorer 10, but we
 expect there will be some CSS issues related to the flexible box model.
 
 
 Dependencies for nbconvert (converting notebooks to various formats)
 ====================================================================
 
 pandoc
 ------
 
 The most important dependency of nbconvert is Pandoc_ 1.10 or later, a document format translation program.
 This is not a Python package, so it cannot be expressed as a regular IPython dependency with setuptools.
 
 To install pandoc on Linux, you can generally use your package manager::
 
     sudo apt-get install pandoc
 
 On other platforms, you can get pandoc from `their website <http://johnmacfarlane.net/pandoc/installing.html>`_.
 
 
 .. _ZeroMQ: http://www.zeromq.org
 .. _PyZMQ: https://github.com/zeromq/pyzmq
 .. _paramiko: https://github.com/robey/paramiko
 .. _pygments: http://pygments.org
-.. _pexpect: http://www.noah.org/wiki/Pexpect
+.. _pexpect: http://pexpect.readthedocs.org/en/latest/
 .. _Jinja: http://jinja.pocoo.org
 .. _Sphinx: http://sphinx-doc.org
 .. _pandoc: http://johnmacfarlane.net/pandoc
 .. _Tornado: http://www.tornadoweb.org
 .. _MathJax: http://www.mathjax.org

scripts/ipython_win_post_install.py

@@ -1,148 +1,147 b''
 #!python
 """Distutils post installation script for Windows.
 
 http://docs.python.org/2/distutils/builtdist.html#the-postinstallation-script
 
 """
 
 from __future__ import print_function
 
 import os
 import sys
 import shutil
 
 try:
     import setuptools
     have_setuptools = True
 except ImportError:
     have_setuptools = False
 
 
 pjoin = os.path.join
 
 # suffix for start menu folder names
 pyver = "(Py%i.%i %i bit)" % (sys.version_info[0], sys.version_info[1],
                               (32, 64)[sys.maxsize > 2**32])
 
 
 def mkshortcut(target, description, linkdir, arguments="", iconpath='',
                workdir="%HOMEDRIVE%%HOMEPATH%", iconindex=0):
     """Make a shortcut if it doesn't exist and register its creation."""
     filename = pjoin(linkdir, description + '.lnk')
     description = "%s %s" % (description, pyver)
     create_shortcut(target, description, filename, arguments, workdir,
                     iconpath, iconindex)
     file_created(filename)
 
 
 def arguments(scriptsdir, script, scriptargs=''):
     """Return command line arguments to be passed to the python executable."""
     cmdbase = suffix(pjoin(scriptsdir, script))
     if have_setuptools:
         cmdbase += '-script.py'
     return '"%s" %s' % (cmdbase, scriptargs)
 
 
 def suffix(s):
     """Add '3' suffix to programs for Python 3."""
     if sys.version_info[0] == 3:
         s = s + '3'
     return s
 
 
 def install():
     """Routine to be run by the win32 installer with the -install switch."""
     # Get some system constants
     python = pjoin(sys.prefix, 'python.exe')
     pythonw = pjoin(sys.prefix, 'pythonw.exe')
 
     if not have_setuptools:
         # This currently doesn't work without setuptools,
         # so don't bother making broken links
         print("Setuptools is required to"
               " create Start Menu items.", file=sys.stderr)
         print("Re-run this installer after installing"
               " Setuptools to get Start Menu items.", file=sys.stderr)
         return
 
     # Lookup path to common startmenu ...
     ip_start_menu = pjoin(get_special_folder_path('CSIDL_COMMON_PROGRAMS'),
                           'IPython %s' % pyver)
 
     # Create IPython entry ...
     if not os.path.isdir(ip_start_menu):
         os.mkdir(ip_start_menu)
         directory_created(ip_start_menu)
 
     # Create .py and .bat files to make things available from
     # the Windows command line.  Thanks to the Twisted project
     # for this logic!
     programs = [
         'ipython',
         'iptest',
         'ipcontroller',
         'ipengine',
         'ipcluster',
-        'irunner',
     ]
     programs = [suffix(p) for p in programs]
     scripts = pjoin(sys.prefix, 'scripts')
     if not have_setuptools:
         # only create .bat files if we don't have setuptools
         for program in programs:
             raw = pjoin(scripts, program)
             bat = raw + '.bat'
             py = raw + '.py'
             # Create .py versions of the scripts
             shutil.copy(raw, py)
             # Create .bat files for each of the scripts
             bat_file = file(bat, 'w')
             bat_file.write("@%s %s %%*" % (python, py))
             bat_file.close()
 
     # Create Start Menu shortcuts
     iconpath = pjoin(scripts, 'ipython.ico')
     mkshortcut(python, 'IPython', ip_start_menu,
                arguments(scripts, 'ipython'), iconpath)
     mkshortcut(python, 'IPython (pylab mode)', ip_start_menu,
                arguments(scripts, 'ipython', '--pylab'), iconpath)
     mkshortcut(python, 'IPython Controller', ip_start_menu,
                arguments(scripts, 'ipcontroller'), iconpath)
     mkshortcut(python, 'IPython Engine', ip_start_menu,
                arguments(scripts, 'ipengine'), iconpath)
     mkshortcut(pythonw, 'IPython Qt Console', ip_start_menu,
                arguments(scripts, 'ipython', 'qtconsole'), iconpath)
 
     iconpath = pjoin(scripts, 'ipython_nb.ico')
     mkshortcut(python, 'IPython Notebook', ip_start_menu,
                arguments(scripts, 'ipython', 'notebook'), iconpath)
 
     mkshortcut(pythonw, 'IPython Documentation', ip_start_menu,
                '-m webbrowser -t "http://ipython.org/documentation.html',
                iconpath='url.dll')
 
     # Disable pysh Start item until the profile restores functionality
     # Most of this code is in IPython/deathrow, and needs to be updated
     # to 0.11 APIs
     #mkshortcut(python, 'IPython%s (command prompt mode)', ip_start_menu,
     #           arguments(scripts, 'ipython', 'profile=pysh --init'))
 
 
 def remove():
     """Routine to be run by the win32 installer with the -remove switch."""
     pass
 
 
 # main()
 if len(sys.argv) > 1:
     if sys.argv[1] == '-install':
         try:
             install()
         except OSError:
             print("Failed to create Start Menu items, try running the"
                   " installer as administrator.", file=sys.stderr)
     elif sys.argv[1] == '-remove':
         remove()
     else:
         print("Script was called with option %s" % sys.argv[1],
               file=sys.stderr)

setup.py

@@ -1,344 +1,341 b''
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """Setup script for IPython.
 
 Under Posix environments it works like a typical setup.py script.
 Under Windows, the command sdist is not supported, since IPython
 requires utilities which are not available under Windows."""
 
 #-----------------------------------------------------------------------------
 #  Copyright (c) 2008-2011, IPython Development Team.
 #  Copyright (c) 2001-2007, Fernando Perez <[e-mail]>
 #  Copyright (c) 2001, Janko Hauser <[e-mail]>
 #  Copyright (c) 2001, Nathaniel Gray <[e-mail]>
 #
 #  Distributed under the terms of the Modified BSD License.
 #
 #  The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Minimal Python version sanity check
 #-----------------------------------------------------------------------------
 from __future__ import print_function
 
 import sys
 
 # This check is also made in IPython/__init__, don't forget to update both when
 # changing Python version requirements.
 if sys.version_info[:2] < (2,7):
     error = "ERROR: IPython requires Python Version 2.7 or above."
     print(error, file=sys.stderr)
     sys.exit(1)
 
 PY3 = (sys.version_info[0] >= 3)
 
 # At least we're on the python version we need, move on.
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
 # Stdlib imports
 import os
 import shutil
 
 from glob import glob
 
 # BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
 # update it when the contents of directories change.
 if os.path.exists('MANIFEST'): os.remove('MANIFEST')
 
 from distutils.core import setup
 
 # Our own imports
 from setupbase import target_update
 
 from setupbase import (
     setup_args,
     find_packages,
     find_package_data,
     find_entry_points,
     build_scripts_entrypt,
     find_data_files,
     check_for_dependencies,
     git_prebuild,
     check_submodule_status,
     update_submodules,
     require_submodules,
     UpdateSubmodules,
     CompileCSS,
     JavascriptVersion,
     install_symlinked,
     install_lib_symlink,
     install_scripts_for_symlink,
     unsymlink,
 )
 from setupext import setupext
 
 isfile = os.path.isfile
 pjoin = os.path.join
 
 #-----------------------------------------------------------------------------
 # Function definitions
 #-----------------------------------------------------------------------------
 
 def cleanup():
     """Clean up the junk left around by the build process"""
     if "develop" not in sys.argv and "egg_info" not in sys.argv:
         try:
             shutil.rmtree('ipython.egg-info')
         except:
             try:
                 os.unlink('ipython.egg-info')
             except:
                 pass
 
 #-------------------------------------------------------------------------------
 # Handle OS specific things
 #-------------------------------------------------------------------------------
 
 if os.name in ('nt','dos'):
     os_name = 'windows'
 else:
     os_name = os.name
 
 # Under Windows, 'sdist' has not been supported.  Now that the docs build with
 # Sphinx it might work, but let's not turn it on until someone confirms that it
 # actually works.
 if os_name == 'windows' and 'sdist' in sys.argv:
     print('The sdist command is not available under Windows.  Exiting.')
     sys.exit(1)
 
 #-------------------------------------------------------------------------------
 # Make sure we aren't trying to run without submodules
 #-------------------------------------------------------------------------------
 here = os.path.abspath(os.path.dirname(__file__))
 
 def require_clean_submodules():
     """Check on git submodules before distutils can do anything
 
     Since distutils cannot be trusted to update the tree
     after everything has been set in motion,
     this is not a distutils command.
     """
     # PACKAGERS: Add a return here to skip checks for git submodules
     
     # don't do anything if nothing is actually supposed to happen
     for do_nothing in ('-h', '--help', '--help-commands', 'clean', 'submodule'):
         if do_nothing in sys.argv:
             return
 
     status = check_submodule_status(here)
 
     if status == "missing":
         print("checking out submodules for the first time")
         update_submodules(here)
     elif status == "unclean":
         print('\n'.join([
             "Cannot build / install IPython with unclean submodules",
             "Please update submodules with",
             "    python setup.py submodule",
             "or",
             "    git submodule update",
             "or commit any submodule changes you have made."
         ]))
         sys.exit(1)
 
 require_clean_submodules()
 
 #-------------------------------------------------------------------------------
 # Things related to the IPython documentation
 #-------------------------------------------------------------------------------
 
 # update the manuals when building a source dist
 if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
 
     # List of things to be updated. Each entry is a triplet of args for
     # target_update()
     to_update = [
                   # FIXME - Disabled for now: we need to redo an automatic way
                   # of generating the magic info inside the rst.
                   #('docs/magic.tex',
                   #['IPython/Magic.py'],
                   #"cd doc && ./update_magic.sh" ),
 
                  ('docs/man/ipcluster.1.gz',
                   ['docs/man/ipcluster.1'],
                   'cd docs/man && gzip -9c ipcluster.1 > ipcluster.1.gz'),
 
                  ('docs/man/ipcontroller.1.gz',
                   ['docs/man/ipcontroller.1'],
                   'cd docs/man && gzip -9c ipcontroller.1 > ipcontroller.1.gz'),
 
                  ('docs/man/ipengine.1.gz',
                   ['docs/man/ipengine.1'],
                   'cd docs/man && gzip -9c ipengine.1 > ipengine.1.gz'),
 
                  ('docs/man/iplogger.1.gz',
                   ['docs/man/iplogger.1'],
                   'cd docs/man && gzip -9c iplogger.1 > iplogger.1.gz'),
 
                  ('docs/man/ipython.1.gz',
                   ['docs/man/ipython.1'],
                   'cd docs/man && gzip -9c ipython.1 > ipython.1.gz'),
 
-                 ('docs/man/irunner.1.gz',
-                  ['docs/man/irunner.1'],
-                  'cd docs/man && gzip -9c irunner.1 > irunner.1.gz'),
                  ]
 
 
     [ target_update(*t) for t in to_update ]
 
 #---------------------------------------------------------------------------
 # Find all the packages, package data, and data_files
 #---------------------------------------------------------------------------
 
 packages = find_packages()
 package_data = find_package_data()
 data_files = find_data_files()
 
 setup_args['packages'] = packages
 setup_args['package_data'] = package_data
 setup_args['data_files'] = data_files
 
 #---------------------------------------------------------------------------
 # custom distutils commands
 #---------------------------------------------------------------------------
 # imports here, so they are after setuptools import if there was one
 from distutils.command.sdist import sdist
 from distutils.command.upload import upload
 
 class UploadWindowsInstallers(upload):
 
     description = "Upload Windows installers to PyPI (only used from tools/release_windows.py)"
     user_options = upload.user_options + [
         ('files=', 'f', 'exe file (or glob) to upload')
     ]
     def initialize_options(self):
         upload.initialize_options(self)
         meta = self.distribution.metadata
         base = '{name}-{version}'.format(
             name=meta.get_name(),
             version=meta.get_version()
         )
         self.files = os.path.join('dist', '%s.*.exe' % base)
 
     def run(self):
         for dist_file in glob(self.files):
             self.upload_file('bdist_wininst', 'any', dist_file)
 
 setup_args['cmdclass'] = {
     'build_py': git_prebuild('IPython'),
     'sdist' : git_prebuild('IPython', sdist),
     'upload_wininst' : UploadWindowsInstallers,
     'submodule' : UpdateSubmodules,
     'css' : CompileCSS,
     'symlink': install_symlinked,
     'install_lib_symlink': install_lib_symlink,
     'install_scripts_sym': install_scripts_for_symlink,
     'unsymlink': unsymlink,
     'jsversion' : JavascriptVersion,
 }
 
 #---------------------------------------------------------------------------
 # Handle scripts, dependencies, and setuptools specific things
 #---------------------------------------------------------------------------
 
 # For some commands, use setuptools.  Note that we do NOT list install here!
 # If you want a setuptools-enhanced install, just run 'setupegg.py install'
 needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm',
            'bdist', 'bdist_dumb', 'bdist_wininst', 'install_egg_info',
            'egg_info', 'easy_install', 'upload',
             ))
 if sys.platform == 'win32':
     # Depend on setuptools for install on *Windows only*
     # If we get script-installation working without setuptools,
     # then we can back off, but until then use it.
     # See Issue #369 on GitHub for more
     needs_setuptools.add('install')
 
 if len(needs_setuptools.intersection(sys.argv)) > 0:
     import setuptools
 
 # This dict is used for passing extra arguments that are setuptools
 # specific to setup
 setuptools_extra_args = {}
 
 if 'setuptools' in sys.modules:
     # setup.py develop should check for submodules
     from setuptools.command.develop import develop
     setup_args['cmdclass']['develop'] = require_submodules(develop)
     
     setuptools_extra_args['zip_safe'] = False
     setuptools_extra_args['entry_points'] = {'console_scripts':find_entry_points()}
     setup_args['extras_require'] = dict(
         parallel = 'pyzmq>=2.1.11',
         qtconsole = ['pyzmq>=2.1.11', 'pygments'],
         zmq = 'pyzmq>=2.1.11',
         doc = ['Sphinx>=1.1', 'numpydoc'],
         test = 'nose>=0.10.1',
         notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2'],
         nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3']
     )
     everything = set()
     for deps in setup_args['extras_require'].values():
         if not isinstance(deps, list):
             deps = [deps]
         for dep in deps:
             everything.add(dep)
     setup_args['extras_require']['all'] = everything
     
     requires = setup_args.setdefault('install_requires', [])
     setupext.display_status = False
     if not setupext.check_for_readline():
         if sys.platform == 'darwin':
             requires.append('readline')
         elif sys.platform.startswith('win'):
             # Pyreadline 64 bit windows issue solved in versions >=1.7.1
             # Also solves issues with some older versions of pyreadline that
             # satisfy the unconstrained depdendency.
             requires.append('pyreadline>=1.7.1')
         else:
             pass
             # do we want to install readline here?
 
     # Script to be run by the windows binary installer after the default setup
     # routine, to add shortcuts and similar windows-only things.  Windows
     # post-install scripts MUST reside in the scripts/ dir, otherwise distutils
     # doesn't find them.
     if 'bdist_wininst' in sys.argv:
         if len(sys.argv) > 2 and \
                ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
             print >> sys.stderr, "ERROR: bdist_wininst must be run alone. Exiting."
             sys.exit(1)
         setup_args['data_files'].append(
             ['Scripts', ('scripts/ipython.ico', 'scripts/ipython_nb.ico')])
         setup_args['scripts'] = [pjoin('scripts','ipython_win_post_install.py')]
         setup_args['options'] = {"bdist_wininst":
                                  {"install_script":
                                   "ipython_win_post_install.py"}}
 
 else:
     # If we are running without setuptools, call this function which will
     # check for dependencies an inform the user what is needed.  This is
     # just to make life easy for users.
     check_for_dependencies()
     # scripts has to be a non-empty list, or install_scripts isn't called
     setup_args['scripts'] = [e.split('=')[0].strip() for e in find_entry_points()]
 
     setup_args['cmdclass']['build_scripts'] = build_scripts_entrypt
 
 #---------------------------------------------------------------------------
 # Do the actual setup now
 #---------------------------------------------------------------------------
 
 setup_args.update(setuptools_extra_args)
 
 def main():
     setup(**setup_args)
     cleanup()
 
 if __name__ == '__main__':
     main()