##// END OF EJS Templates
Merge pull request #4846 from takluyver/irunner-vestiges...
Paul Ivanov -
r14710:0622e829 merge
parent child Browse files
Show More
@@ -190,11 +190,14 b' get. These are:'
190
190
191 * readline (for command line editing, tab completion, etc.)
191 * readline (for command line editing, tab completion, etc.)
192 * nose (to run the IPython test suite)
192 * nose (to run the IPython test suite)
193 * pexpect (to use things like irunner)
194
193
195 If you are comfortable installing these things yourself, have at it, otherwise
194 If you are comfortable installing these things yourself, have at it, otherwise
196 read on for more details.
195 read on for more details.
197
196
197 IPython uses several other modules, such as pexpect_ and path.py, if they are
198 installed on your system, but it can also use bundled versions from
199 :mod:`IPython.external`, so there's no need to install them separately.
200
198 readline
201 readline
199 --------
202 --------
200
203
@@ -262,25 +265,6 b' iptest command:'
262
265
263 $ iptest
266 $ iptest
264
267
265 pexpect
266 -------
267
268 The pexpect_ package is used in IPython's :command:`irunner` script, as well as
269 for managing subprocesses. IPython now includes a version of pexpect in
270 :mod:`IPython.external`, but if you have installed pexpect, IPython will use
271 that instead. On Unix platforms (including OS X), just do:
272
273 .. code-block:: bash
274
275 $ pip install pexpect
276
277 .. note::
278
279 On Python 3, you should actually install :mod:`pexpect-u`,
280 a unicode-safe fork of pexpect.
281
282 Windows users are out of luck as pexpect does not run there.
283
284 Dependencies for IPython.parallel (parallel computing)
268 Dependencies for IPython.parallel (parallel computing)
285 ======================================================
269 ======================================================
286
270
@@ -441,7 +425,7 b' On other platforms, you can get pandoc from `their website <http://johnmacfarlan'
441 .. _PyZMQ: https://github.com/zeromq/pyzmq
425 .. _PyZMQ: https://github.com/zeromq/pyzmq
442 .. _paramiko: https://github.com/robey/paramiko
426 .. _paramiko: https://github.com/robey/paramiko
443 .. _pygments: http://pygments.org
427 .. _pygments: http://pygments.org
444 .. _pexpect: http://www.noah.org/wiki/Pexpect
428 .. _pexpect: http://pexpect.readthedocs.org/en/latest/
445 .. _Jinja: http://jinja.pocoo.org
429 .. _Jinja: http://jinja.pocoo.org
446 .. _Sphinx: http://sphinx-doc.org
430 .. _Sphinx: http://sphinx-doc.org
447 .. _pandoc: http://johnmacfarlane.net/pandoc
431 .. _pandoc: http://johnmacfarlane.net/pandoc
@@ -83,7 +83,6 b' def install():'
83 'ipcontroller',
83 'ipcontroller',
84 'ipengine',
84 'ipengine',
85 'ipcluster',
85 'ipcluster',
86 'irunner',
87 ]
86 ]
88 programs = [suffix(p) for p in programs]
87 programs = [suffix(p) for p in programs]
89 scripts = pjoin(sys.prefix, 'scripts')
88 scripts = pjoin(sys.prefix, 'scripts')
@@ -183,9 +183,6 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
183 ['docs/man/ipython.1'],
183 ['docs/man/ipython.1'],
184 'cd docs/man && gzip -9c ipython.1 > ipython.1.gz'),
184 'cd docs/man && gzip -9c ipython.1 > ipython.1.gz'),
185
185
186 ('docs/man/irunner.1.gz',
187 ['docs/man/irunner.1'],
188 'cd docs/man && gzip -9c irunner.1 > irunner.1.gz'),
189 ]
186 ]
190
187
191
188
General Comments 0
You need to be logged in to leave comments. Login now