##// END OF EJS Templates
Merge pull request #9900 from Carreau/update-no-2x...
Carol Willing -
r22824:59b38638 merge
parent child Browse files
Show More
@@ -22,17 +22,24 b' from __future__ import absolute_import'
22 22
23 23 import os
24 24 import sys
25 import warnings
26 25
27 26 #-----------------------------------------------------------------------------
28 27 # Setup everything
29 28 #-----------------------------------------------------------------------------
30 29
31 30 # Don't forget to also update setup.py when this changes!
32 v = sys.version_info
33 if v[:2] < (3,3):
34 raise ImportError('IPython requires Python version 3.3 or above.')
35 del v
31 if sys.version_info < (3,3):
32 raise ImportError(
33 """
34 IPython 6.0+ does not support Python 2.6, 2.7, 3.0, 3.1, or 3.2.
35 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
36 Beginning with IPython 6.0, Python 3.3 and above is required.
37
38 See IPython `README.rst` file for more information:
39
40 https://github.com/ipython/ipython/blob/master/README.rst
41
42 """)
36 43
37 44 # Make it easy to import extensions - they are always directly on pythonpath.
38 45 # Therefore, non-IPython modules can be added to extensions directory.
@@ -143,4 +150,3 b' def start_kernel(argv=None, **kwargs):'
143 150 """
144 151 from IPython.kernel.zmq.kernelapp import launch_new_instance
145 152 return launch_new_instance(argv=argv, **kwargs)
146
@@ -36,16 +36,52 b' Development and Instant runnimg'
36 36 ================================
37 37
38 38 You can find the latest version of the development documentation on `readthedocs
39 <http://ipython.readthedocs.io/en/latest/>`_.
39 <http://ipython.readthedocs.io/en/latest/>`_.
40 40
41 41 You can run IPython from this directory without even installing it system-wide
42 42 by typing at the terminal::
43
43
44 44 $ python -m IPython
45 45
46 46 Or see the `development installation docs
47 47 <http://ipython.readthedocs.io/en/latest/install/install.html#installing-the-development-version>`_
48 for the latest revision on read the docs.
48 for the latest revision on read the docs.
49 49
50 50 Documentation and installation instructions for older version of IPython can be
51 51 found on the `IPython website <http://ipython.org/documentation.html>`_
52
53
54
55 IPython requires Python version 3 or above
56 ==========================================
57
58 Starting with version 6.0, IPython does not support Python 2.7, 3.0, 3.1, or
59 3.2.
60
61 For a version compatible with Python 2.7, please install the 5.x LTS Long Term
62 Support version.
63
64 If you are encountering this error message you are likely trying to install or
65 use IPython from source. You need to checkout the remote 5.x branch. If you are
66 using git the following should work:
67
68 $ git fetch origin
69 $ git checkout -b origin/5.x
70
71 If you encounter this error message with a regular install of IPython, then you
72 likely need to update your package manager, for example if you are using `pip`
73 check the version of pip with
74
75 $ pip --version
76
77 You will need to update pip to the version 8.2 or greater. If you are not using
78 pip, please inquiry with the maintainers of the package for your package
79 manager.
80
81 For more information see one of our blog posts:
82
83 http://blog.jupyter.org/2016/07/08/ipython-5-0-released/
84
85 As well as the following Pull-Request for discussion:
86
87 https://github.com/ipython/ipython/pull/9900
@@ -26,9 +26,18 b' import sys'
26 26
27 27 # This check is also made in IPython/__init__, don't forget to update both when
28 28 # changing Python version requirements.
29 v = sys.version_info
30 if v[:2] < (3,3):
31 error = "ERROR: IPython requires Python version 3.3 or above."
29 if sys.version_info < (3,3):
30 error = """
31 IPython 6.0+ does not support Python 2.6, 2.7, 3.0, 3.1, or 3.2.
32 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
33 Beginning with IPython 6.0, Python 3.3 and above is required.
34
35 See IPython `README.rst` file for more information:
36
37 https://github.com/ipython/ipython/blob/master/README.rst
38
39 """
40
32 41 print(error, file=sys.stderr)
33 42 sys.exit(1)
34 43
General Comments 0
You need to be logged in to leave comments. Login now