Skip to content

Commit

Permalink
Merge pull request #4846 from takluyver/irunner-vestiges
Browse files Browse the repository at this point in the history
Remove some leftover traces of irunner
  • Loading branch information
ivanov committed Jan 23, 2014
2 parents 03d9fde + c0d639a commit 0622e82
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 25 deletions.
26 changes: 5 additions & 21 deletions docs/source/install/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,14 @@ 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
--------

Expand Down Expand Up @@ -262,25 +265,6 @@ iptest command:
$ 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)
======================================================

Expand Down Expand Up @@ -441,7 +425,7 @@ On other platforms, you can get pandoc from `their website <http://johnmacfarlan
.. _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
Expand Down
1 change: 0 additions & 1 deletion scripts/ipython_win_post_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ def install():
'ipcontroller',
'ipengine',
'ipcluster',
'irunner',
]
programs = [suffix(p) for p in programs]
scripts = pjoin(sys.prefix, 'scripts')
Expand Down
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,6 @@ def require_clean_submodules():
['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'),
]


Expand Down

0 comments on commit 0622e82

Please sign in to comment.