##// END OF EJS Templates
Merge pull request #10439 from willingc/readme-py2...
Thomas Kluyver -
r23536:c1fb5a7a merge
parent child Browse files
Show More
@@ -1,13 +1,13 b''
1 .. image:: https://codecov.io/github/ipython/ipython/coverage.svg?branch=master
1 .. image:: https://codecov.io/github/ipython/ipython/coverage.svg?branch=master
2 :target: https://codecov.io/github/ipython/ipython?branch=master
2 :target: https://codecov.io/github/ipython/ipython?branch=master
3
3
4 .. image:: https://img.shields.io/pypi/dm/IPython.svg
4 .. image:: https://img.shields.io/pypi/dm/IPython.svg
5 :target: https://pypi.python.org/pypi/ipython
5 :target: https://pypi.python.org/pypi/ipython
6
6
7 .. image:: https://img.shields.io/pypi/v/IPython.svg
7 .. image:: https://img.shields.io/pypi/v/IPython.svg
8 :target: https://pypi.python.org/pypi/ipython
8 :target: https://pypi.python.org/pypi/ipython
9
9
10 .. image:: https://img.shields.io/travis/ipython/ipython.svg
10 .. image:: https://img.shields.io/travis/ipython/ipython.svg
11 :target: https://travis-ci.org/ipython/ipython
11 :target: https://travis-ci.org/ipython/ipython
12
12
13
13
@@ -22,8 +22,14 b' Welcome to IPython. Our full documentation is available on `ipython.readthedocs'
22 <https://ipython.readthedocs.io/en/stable/>`_ and contains information on how to install, use and
22 <https://ipython.readthedocs.io/en/stable/>`_ and contains information on how to install, use and
23 contribute to the project.
23 contribute to the project.
24
24
25 Officially, IPython requires Python version 3.3 and above.
25 **IPython versions and Python Support**
26 IPython 5.x is the last IPython version to support Python 2.7.
26
27 **IPython 6** requires Python version 3.3 and above.
28
29 **IPython 5.x LTS** is the compatible release for Python 2.7.
30 If you require Python 2 support, you **must** use IPython 5.x LTS. Please
31 update your project configurations and requirements as necessary.
32
27
33
28 The Notebook, Qt console and a number of other pieces are now parts of *Jupyter*.
34 The Notebook, Qt console and a number of other pieces are now parts of *Jupyter*.
29 See the `Jupyter installation docs <http://jupyter.readthedocs.io/en/latest/install.html>`__
35 See the `Jupyter installation docs <http://jupyter.readthedocs.io/en/latest/install.html>`__
General Comments 0
You need to be logged in to leave comments. Login now