diff --git a/docs/source/_static/default.css b/docs/source/_static/default.css deleted file mode 100644 index 7938313..0000000 --- a/docs/source/_static/default.css +++ /dev/null @@ -1,534 +0,0 @@ -/** - * Alternate Sphinx design - * Originally created by Armin Ronacher for Werkzeug, adapted by Georg Brandl. - */ - -body { - font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif; - font-size: 14px; - letter-spacing: -0.01em; - line-height: 150%; - text-align: center; - /*background-color: #AFC1C4; */ - background-color: #BFD1D4; - color: black; - padding: 0; - border: 1px solid #aaa; - - margin: 0px 80px 0px 80px; - min-width: 740px; -} - -a { - color: #CA7900; - text-decoration: none; -} - -a:hover { - color: #2491CF; -} - -pre { - font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace; - font-size: 0.95em; - letter-spacing: 0.015em; - padding: 0.5em; - border: 1px solid #ccc; - background-color: #f8f8f8; -} - -td.linenos pre { - padding: 0.5em 0; - border: 0; - background-color: transparent; - color: #aaa; -} - -table.highlighttable { - margin-left: 0.5em; -} - -table.highlighttable td { - padding: 0 0.5em 0 0.5em; -} - -cite, code, tt { - font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace; - font-size: 0.95em; - letter-spacing: 0.01em; -} - -hr { - border: 1px solid #abc; - margin: 2em; -} - -tt { - background-color: #f2f2f2; - border-bottom: 1px solid #ddd; - color: #333; -} - -tt.descname { - background-color: transparent; - font-weight: bold; - font-size: 1.2em; - border: 0; -} - -tt.descclassname { - background-color: transparent; - border: 0; -} - -tt.xref { - background-color: transparent; - font-weight: bold; - border: 0; -} - -a tt { - background-color: transparent; - font-weight: bold; - border: 0; - color: #CA7900; -} - -a tt:hover { - color: #2491CF; -} - -dl { - margin-bottom: 15px; -} - -dd p { - margin-top: 0px; -} - -dd ul, dd table { - margin-bottom: 10px; -} - -dd { - margin-top: 3px; - margin-bottom: 10px; - margin-left: 30px; -} - -.refcount { - color: #060; -} - -dt { - font-weight: bold; - padding-left: 0.5em; -} - -dt:target, -.highlight { - background-color: #fbe54e; -} - -dl.class, dl.function { - border-top: 2px solid #888; -} - -dl.method, dl.attribute { - border-top: 1px solid #aaa; -} - -dl.glossary dt { - font-weight: bold; - font-size: 1.1em; -} - -pre { - line-height: 120%; -} - -pre a { - color: inherit; - text-decoration: underline; -} - -.first { - margin-top: 0 !important; -} - -div.document { - background-color: white; - text-align: left; - background-image: url(contents.png); - background-repeat: repeat-x; -} - -/* -div.documentwrapper { - width: 100%; -} -*/ - -div.clearer { - clear: both; -} - -div.related h3 { - display: none; -} - -div.related ul { - background-image: url(navigation.png); - height: 2em; - list-style: none; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - margin: 0; - padding-left: 10px; -} - -div.related ul li { - margin: 0; - padding: 0; - height: 2em; - float: left; -} - -div.related ul li.right { - float: right; - margin-right: 5px; -} - -div.related ul li a { - margin: 0; - padding: 0 5px 0 5px; - line-height: 1.75em; - color: #EE9816; -} - -div.related ul li a:hover { - color: #3CA8E7; -} - -div.body { - margin: 0; - padding: 0.5em 20px 20px 20px; -} - -div.bodywrapper { - margin: 0 240px 0 0; - border-right: 1px solid #ccc; -} - -div.body a { - text-decoration: underline; -} - -div.sphinxsidebar { - margin: 0; - padding: 0.5em 15px 15px 0; - width: 210px; - float: right; - text-align: left; -/* margin-left: -100%; */ -} - -div.sphinxsidebar h4, div.sphinxsidebar h3 { - margin: 1em 0 0.5em 0; - font-size: 0.9em; - padding: 0.1em 0 0.1em 0.5em; - color: white; - border: 1px solid #86989B; - background-color: #AFC1C4; -} - -div.sphinxsidebar ul { - padding-left: 1.5em; - margin-top: 7px; - list-style: none; - padding: 0; - line-height: 130%; -} - -div.sphinxsidebar ul ul { - list-style: square; - margin-left: 20px; -} - -p { - margin: 0.8em 0 0.5em 0; -} - -p.rubric { - font-weight: bold; -} - -h1 { - margin: 0; - padding: 0.7em 0 0.3em 0; - font-size: 1.5em; - color: #11557C; -} - -h2 { - margin: 1.3em 0 0.2em 0; - font-size: 1.35em; - padding: 0; -} - -h3 { - margin: 1em 0 0.2em 0; - font-size: 1.2em; -} - -h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { - color: black!important; -} - -h1 a.anchor, h2 a.anchor, h3 a.anchor, h4 a.anchor, h5 a.anchor, h6 a.anchor { - display: none; - margin: 0 0 0 0.3em; - padding: 0 0.2em 0 0.2em; - color: #aaa!important; -} - -h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor, -h5:hover a.anchor, h6:hover a.anchor { - display: inline; -} - -h1 a.anchor:hover, h2 a.anchor:hover, h3 a.anchor:hover, h4 a.anchor:hover, -h5 a.anchor:hover, h6 a.anchor:hover { - color: #777; - background-color: #eee; -} - -table { - border-collapse: collapse; - margin: 0 -0.5em 0 -0.5em; -} - -table td, table th { - padding: 0.2em 0.5em 0.2em 0.5em; -} - -div.footer { - background-color: #E3EFF1; - color: #86989B; - padding: 3px 8px 3px 0; - clear: both; - font-size: 0.8em; - text-align: right; -} - -div.footer a { - color: #86989B; - text-decoration: underline; -} - -div.pagination { - margin-top: 2em; - padding-top: 0.5em; - border-top: 1px solid black; - text-align: center; -} - -div.sphinxsidebar ul.toc { - margin: 1em 0 1em 0; - padding: 0 0 0 0.5em; - list-style: none; -} - -div.sphinxsidebar ul.toc li { - margin: 0.5em 0 0.5em 0; - font-size: 0.9em; - line-height: 130%; -} - -div.sphinxsidebar ul.toc li p { - margin: 0; - padding: 0; -} - -div.sphinxsidebar ul.toc ul { - margin: 0.2em 0 0.2em 0; - padding: 0 0 0 1.8em; -} - -div.sphinxsidebar ul.toc ul li { - padding: 0; -} - -div.admonition, div.warning { - font-size: 0.9em; - margin: 1em 0 0 0; - border: 1px solid #86989B; - background-color: #f7f7f7; -} - -div.admonition p, div.warning p { - margin: 0.5em 1em 0.5em 1em; - padding: 0; -} - -div.admonition pre, div.warning pre { - margin: 0.4em 1em 0.4em 1em; -} - -div.admonition p.admonition-title, -div.warning p.admonition-title { - margin: 0; - padding: 0.1em 0 0.1em 0.5em; - color: white; - border-bottom: 1px solid #86989B; - font-weight: bold; - background-color: #AFC1C4; -} - -div.warning { - border: 1px solid #940000; -} - -div.warning p.admonition-title { - background-color: #CF0000; - border-bottom-color: #940000; -} - -div.admonition ul, div.admonition ol, -div.warning ul, div.warning ol { - margin: 0.1em 0.5em 0.5em 3em; - padding: 0; -} - -div.versioninfo { - margin: 1em 0 0 0; - border: 1px solid #ccc; - background-color: #DDEAF0; - padding: 8px; - line-height: 1.3em; - font-size: 0.9em; -} - - -a.headerlink { - color: #c60f0f!important; - font-size: 1em; - margin-left: 6px; - padding: 0 4px 0 4px; - text-decoration: none!important; - visibility: hidden; -} - -h1:hover > a.headerlink, -h2:hover > a.headerlink, -h3:hover > a.headerlink, -h4:hover > a.headerlink, -h5:hover > a.headerlink, -h6:hover > a.headerlink, -dt:hover > a.headerlink { - visibility: visible; -} - -a.headerlink:hover { - background-color: #ccc; - color: white!important; -} - -table.indextable td { - text-align: left; - vertical-align: top; -} - -table.indextable dl, table.indextable dd { - margin-top: 0; - margin-bottom: 0; -} - -table.indextable tr.pcap { - height: 10px; -} - -table.indextable tr.cap { - margin-top: 10px; - background-color: #f2f2f2; -} - -img.toggler { - margin-right: 3px; - margin-top: 3px; - cursor: pointer; -} - -img.inheritance { - border: 0px -} - -form.pfform { - margin: 10px 0 20px 0; -} - -table.contentstable { - width: 90%; -} - -table.contentstable p.biglink { - line-height: 150%; -} - -a.biglink { - font-size: 1.3em; -} - -span.linkdescr { - font-style: italic; - padding-top: 5px; - font-size: 90%; -} - -.search input[name=q] { - max-width: 100%; - box-sizing: border-box; - -moz-box-sizing: border-box; -} - -ul.search { - margin: 10px 0 0 20px; - padding: 0; -} - -ul.search li { - padding: 5px 0 5px 20px; - background-image: url(file.png); - background-repeat: no-repeat; - background-position: 0 7px; -} - -ul.search li a { - font-weight: bold; -} - -ul.search li div.context { - color: #888; - margin: 2px 0 0 30px; - text-align: left; -} - -ul.keywordmatches li.goodmatch a { - font-weight: bold; -} -div.figure { - text-align: center; -} - -div.versionchanged { - margin-left: 30px; - margin-right: 30px; -} - -span.versionmodified { - font-style: italic; -} - -pre { - white-space: pre-wrap; -} diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html deleted file mode 100644 index 965c354..0000000 --- a/docs/source/_templates/layout.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "!layout.html" %} - - -{% block rootrellink %} -
  • home| 
    • -
  • search| 
    • -
  • documentation »
    • -{% endblock %} - - -{% block relbar1 %} - -
    -IPython Documentation -
    -{{ super() }} -{% endblock %} - -{# put the sidebar before the body #} -{% block sidebar1 %}{{ sidebar() }}{% endblock %} -{% block sidebar2 %}{% endblock %} - diff --git a/docs/source/conf.py b/docs/source/conf.py index 6b7a5fb..91be39f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -34,6 +34,10 @@ if ON_RTD: '__file__': fpath, '__name__': '__main__', }) +else: + import sphinx_rtd_theme + html_theme = "sphinx_rtd_theme" + html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # If your extensions are in another directory, add it here. If the directory # is relative to the documentation root, use os.path.abspath to make it @@ -148,7 +152,7 @@ default_role = 'literal' # The style sheet to use for HTML and HTML Help pages. A file of that name # must exist either in Sphinx' static/ path, or in one of the custom paths # given in html_static_path. -html_style = 'default.css' +# html_style = 'default.css' html_favicon = 'favicon.ico' # The name for this set of Sphinx documents. If None, it defaults to diff --git a/docs/source/coredev/release_process.rst b/docs/source/coredev/release_process.rst index d595f0c..94255d6 100644 --- a/docs/source/coredev/release_process.rst +++ b/docs/source/coredev/release_process.rst @@ -91,6 +91,9 @@ release is: ``1.3rc1``. Notice that there is no separator between the '3' and the 'r'. Check the environment variable `$VERSION` as well. +Comment remove the `developpement` entry in `whatsnew/index.rst`. TODO, figure +out how to make that automatic. + 5. Run the `tools/build_release` script --------------------------------------- @@ -116,7 +119,8 @@ Create and push the tag:: git tag -am "release $VERSION" "$VERSION" git push origin --tags -Update release.py back to `x.y-dev` or `x.y-maint`, and push:: +Update release.py back to `x.y-dev` or `x.y-maint`, and re-add the +`developpement` entry in `docs/source/whatsnew/index.rst` and push:: git commit -am "back to development" git push origin $BRANCH diff --git a/docs/source/index.rst b/docs/source/index.rst index 7b4625e..fd308e1 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -1,3 +1,5 @@ +.. _introduction: + ===================== IPython Documentation ===================== @@ -7,14 +9,81 @@ IPython Documentation :Release: |release| :Date: |today| -Welcome to the official IPython documentation. +Welcome to the official IPython documentation + +IPython provides a rich toolkit to help you make the most out of using Python +interactively. Its main components are: + +* A powerful interactive Python shell +* A `Jupyter `_ kernel to work with Python code in Jupyter + notebooks and other interactive frontends. + +The enhanced interactive Python shells and kernel have the following main +features: + +* Comprehensive object introspection. + +* Input history, persistent across sessions. + +* Caching of output results during a session with automatically generated + references. + +* Extensible tab completion, with support by default for completion of python + variables and keywords, filenames and function keywords. + +* Extensible system of 'magic' commands for controlling the environment and + performing many tasks related either to IPython or the operating system. + +* A rich configuration system with easy switching between different setups + (simpler than changing $PYTHONSTARTUP environment variables every time). + +* Session logging and reloading. + +* Extensible syntax processing for special purpose situations. + +* Access to the system shell with user-extensible alias system. + +* Easily embeddable in other Python programs and GUIs. + +* Integrated access to the pdb debugger and the Python profiler. + + +The Command line interface inherit all the above functionality and posses + +* real multiline editting. + +* syntax highlighting as you type + +* intgration with command line editor for a better workflow. + +The kernel also have its share of feature, when used with a compatible frontend +it allows for: + +* rich display system for object allowing to display Html, Images, Latex,Sounds + Video. + +* interactive widgets with the use of the ``ipywigets`` package. + + +This documentation will walk through most of the features of the IPython +command line and kernel, as well as describe the internals mechanisms in order +to improve your Python workflow. + +You can always find the table of content for this documentation in the left +sidebar, allowing you to come back on previous section if needed, or skip ahead. + + +The latest development version is always available from IPython's `GitHub +repository `_. + + -Contents -======== .. toctree:: :maxdepth: 1 + :hidden: + self overview whatsnew/index install/index diff --git a/docs/source/install/index.rst b/docs/source/install/index.rst index 2d84cfb..d50aaad 100644 --- a/docs/source/install/index.rst +++ b/docs/source/install/index.rst @@ -5,8 +5,56 @@ Installation ============ .. toctree:: - :maxdepth: 2 + :maxdepth: 3 + :hidden: + install kernel_install + + +This sections will guide you into `installing IPython itself `_, and +installing `kernels for jupyter `_ if you are working with +multiple version of Python, or multiple environments. + +To know more, head to the next section. + + +Quick install reminder +~~~~~~~~~~~~~~~~~~~~~~ + +Here is a quick reminder of the various commands needed if you are already +familiar with IPython and are just searching to refresh your memory: + +Install IPython: + +.. code-block:: bash + + $ pip install ipython + + +Install and register an IPython kernel with Jupyter: + + +.. code-block:: bash + + $ python -m pip install ipykernel + + $ python -m ipykernel install [--user] [--name ] [--display-name <"User Friendly Name">] + +for more help see + +.. code-block:: bash + + $ python -m ipykernel install --help + + + +.. seealso:: + + `Installing Jupyter `__ + The Notebook, nbconvert, and many other former pieces of IPython are now + part of Project Jupyter. + + diff --git a/docs/source/install/install.rst b/docs/source/install/install.rst index c2895f6..4e73713 100644 --- a/docs/source/install/install.rst +++ b/docs/source/install/install.rst @@ -1,34 +1,28 @@ -IPython requires Python 2.7 or ≥ 3.3. +Installing IPython +================== -.. seealso:: - `Installing Jupyter `__ - The Notebook, nbconvert, and many other former pieces of IPython are now - part of Project Jupyter. +IPython requires Python 2.7 or ≥ 3.3. -Quickstart -========== +Quick Install +------------- -If you have :mod:`pip`, -the quickest way to get up and running with IPython is: +With ``pip`` already installed : .. code-block:: bash $ pip install ipython -To use IPython with notebooks or the Qt console, you should also install -``jupyter``. +This should install IPython as well as all the other dependency required. -To run IPython's test suite, use the :command:`iptest` command: - -.. code-block:: bash +If you try to use IPython with notebooks or the Qt console, you should also install +``jupyter``. - $ iptest Overview -======== +-------- This document describes in detail the steps required to install IPython. For a few quick ways to get started with package managers or full Python distributions, @@ -36,10 +30,10 @@ see `the install page `_ of the IPython website Please let us know if you have problems installing IPython or any of its dependencies. -IPython and most dependencies can be installed via :command:`pip`. +IPython and most dependencies should be installed via :command:`pip`. In many scenarios, this is the simplest method of installing Python packages. More information about :mod:`pip` can be found on -`its PyPI page `__. +`its PyPI page `__. More general information about installing Python packages can be found in @@ -47,21 +41,20 @@ More general information about installing Python packages can be found in 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:`pip`, -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`. +IPython requires several dependencies to work correctly, it is not recommended +to install IPython and all it's dependencies manually as this can be quite long and trouble some. +You should likely use the python package manager ``pip`` Installation using pip ----------------------- +~~~~~~~~~~~~~~~~~~~~~~ + +Make sure you have the latest version of :mod:`pip` ( the Python package +manager) installed. If you do not, head to `Pip documentation +`_ and install it first. -If you have :mod:`pip`, the easiest way of getting IPython is: +The quickest way to get up and running with IPython is to install it with pip: .. code-block:: bash @@ -71,7 +64,7 @@ That's it. Installation from source ------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~ If you don't want to use :command:`pip`, or don't have it installed, grab the latest stable tarball of IPython `from PyPI @@ -83,12 +76,22 @@ grab the latest stable tarball of IPython `from PyPI $ cd ipython $ pip install . +Do not invoke ``setup.py`` directly as this can have undesirable consequences for further upgrades. +Try to also avoid any usage of ``easy_install`` that can have similar undesirable consequences. + 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`. +permissions, you may need to run the last command with :command:`sudo`. You can +also install in user specific location by using the ``--user`` flag in conjunction with pip + +To can run IPython's test suite, use the :command:`iptest` command from outside of the IPython source tree: + +.. code-block:: bash + + $ iptest Installing the development version ----------------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ It is also possible to install the development version of IPython from our `Git `_ source code repository. To do this you will @@ -100,15 +103,15 @@ need to have Git installed on your system. Then do: $ cd ipython $ pip install . -Some users want to be able to follow the development branch as it changes. If -you have :mod:`pip`, you can replace the last step by: +Some users want to be able to follow the development branch as it changes. +With :mod:`pip` installed, you can replace the last step by: .. code-block:: bash $ pip install -e . This creates links in the right places and installs the command line script to -the appropriate places. +the appropriate location. Then, if you want to update your IPython at any time, do: @@ -119,62 +122,10 @@ Then, if you want to update your IPython at any time, do: .. _dependencies: Dependencies -============ +~~~~~~~~~~~~ IPython relies on a number of other Python packages. Installing using a package manager like pip or conda will ensure the necessary packages are installed. If you install manually, it's up to you to make sure dependencies are installed. -They're not listed here, because they may change from release to release, so a -static list will inevitably get out of date. - -It also has one key non-Python dependency which you may need to install separately. - -readline --------- - -IPython's terminal interface relies on readline to provide features like tab -completion and history navigation. If you only want to use IPython as a kernel -for Jupyter notebooks and other frontends, you don't need readline. - - -**On Windows**, to get full console functionality, *PyReadline* is required. -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 -`__. - -**On OS X**, if you are using the built-in Python shipped by Apple, you will be -missing a proper 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, IPython on OS X depends on the :mod:`gnureadline` 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 on OS X, do (with :mod:`pip` -installed): - -.. code-block:: bash - - $ pip install gnureadline - -.. note:: - - Other Python distributions on OS X (such as Anaconda, fink, MacPorts) - already have proper readline so you likely don't have to do this step. - -When IPython is installed with :mod:`pip`, -the correct readline should be installed if you specify the `terminal` -optional dependencies: - -.. code-block:: bash - - $ pip install "ipython[terminal]" - -**On Linux**, readline is normally installed by default. If not, install it -from your system package manager. If you are compiling your own Python, make -sure you install the readline development headers first. - +They're not listed here, because they may change from release to release, and +depending on platform so a static list will inevitably get out of date. diff --git a/docs/source/overview.rst b/docs/source/overview.rst index f6ebd3d..0419b6c 100644 --- a/docs/source/overview.rst +++ b/docs/source/overview.rst @@ -1,9 +1,6 @@ .. _overview: -============ -Introduction -============ - +======== Overview ======== @@ -18,10 +15,13 @@ interactive and exploratory computing. To support this goal, IPython has three main components: * An enhanced interactive Python shell. + * A decoupled :ref:`two-process communication model `, which allows for multiple clients to connect to a computation kernel, most notably - the web-based notebook. -* An architecture for interactive parallel computing. + the web-based notebook provided with `Jupyter `_. + +* An architecture for interactive parallel computing now part of the + `ipyparallel` package. All of IPython is open source (released under the revised BSD license). @@ -69,8 +69,7 @@ Main features of the interactive shell * Completion in the local namespace, by typing :kbd:`TAB` at the prompt. This works for keywords, modules, methods, variables and files in the - current directory. This is supported via the readline library, and - full access to configuring readline's behavior is provided. + current directory. This is supported via the ``prompt_toolkit`` library. Custom completers can be implemented easily for different purposes (system commands, magic arguments etc.) @@ -79,7 +78,7 @@ Main features of the interactive shell history and caching of all input and output. * User-extensible 'magic' commands. A set of commands prefixed with - :samp:`%` is available for controlling IPython itself and provides + :samp:`%` or :samp:`%%` is available for controlling IPython itself and provides directory control, namespace information and many aliases to common system shell commands. @@ -102,8 +101,8 @@ Main features of the interactive shell allows you to save arbitrary Python variables. These get restored when you run the :samp:`%store -r` command. -* Automatic indentation (optional) of code as you type (through the - readline library). +* Automatic indentation and highlighting of code as you type (through the + `prompt_toolkit` library). * Macro system for quickly re-executing multiple lines of previous input with a single name via the :samp:`%macro` command. Macros can be @@ -204,10 +203,11 @@ This decoupling allows us to have several clients connected to the same kernel, and even allows clients and kernels to live on different machines. With the exclusion of the traditional single process terminal-based IPython (what you start if you run ``ipython`` without any subcommands), all -other IPython machinery uses this two-process model. This includes ``ipython -console``, ``ipython qtconsole``, and ``ipython notebook``. +other IPython machinery uses this two-process model. Most of this is now part +of the `Jupyter` project, whis includes ``jupyter console``, ``jupyter +qtconsole``, and ``jupyter notebook``. -As an example, this means that when you start ``ipython qtconsole``, you're +As an example, this means that when you start ``jupyter qtconsole``, you're really starting two processes, a kernel and a Qt-based client can send commands to and receive results from that kernel. If there is already a kernel running that you want to connect to, you can pass the ``--existing`` flag @@ -217,7 +217,7 @@ running, use the ``%connect_info`` magic to get the unique connection file, which will be something like ``--existing kernel-19732.json`` but with different numbers which correspond to the Process ID of the kernel. -You can read more about using `ipython qtconsole +You can read more about using `jupyter qtconsole `_, and `ipython notebook `_. There is also a :ref:`message spec ` which documents the protocol for @@ -232,6 +232,11 @@ and clients. Interactive parallel computing ============================== +.. note:: + + This functionality is optional and now part of the `ipyparallel + `_ project. + Increasingly, parallel computer hardware, such as multicore CPUs, clusters and supercomputers, is becoming ubiquitous. Over the last several years, we have developed an architecture within IPython that allows such hardware to be used diff --git a/docs/source/whatsnew/index.rst b/docs/source/whatsnew/index.rst index e68fa3f..2ce01e8 100644 --- a/docs/source/whatsnew/index.rst +++ b/docs/source/whatsnew/index.rst @@ -20,8 +20,8 @@ development work they do here in a user friendly format. .. toctree:: :maxdepth: 1 - version5 development + version5 version4 github-stats-4 version3