##// END OF EJS Templates
Some readme and formatting Cleanup (#14449)
M Bussonnier -
r28786:1b4607fb merge
parent child Browse files
Show More
@@ -10,7 +10,6 b' explicitly to actually raise a SyntaxError and stay as close as possible to'
10 Python semantics.
10 Python semantics.
11 """
11 """
12
12
13
14 import ast
13 import ast
15 import asyncio
14 import asyncio
16 import inspect
15 import inspect
@@ -5,6 +5,7 b' directory, which we are removing. For now putting this here ensures at least'
5 we do run the test, though ultimately this functionality should all be tested
5 we do run the test, though ultimately this functionality should all be tested
6 with better-isolated tests that don't rely on the global instance in iptest.
6 with better-isolated tests that don't rely on the global instance in iptest.
7 """
7 """
8
8 from IPython.core.splitinput import LineInfo
9 from IPython.core.splitinput import LineInfo
9 from IPython.core.prefilter import AutocallChecker
10 from IPython.core.prefilter import AutocallChecker
10
11
@@ -1,5 +1,6 b''
1 """Tests for autoreload extension.
1 """Tests for autoreload extension.
2 """
2 """
3
3 # -----------------------------------------------------------------------------
4 # -----------------------------------------------------------------------------
4 # Copyright (c) 2012 IPython Development Team.
5 # Copyright (c) 2012 IPython Development Team.
5 #
6 #
@@ -27,6 +27,7 b' prompt_toolkit`s `patch_stdout`)::'
27 In [4]: asyncio.ensure_future(f())
27 In [4]: asyncio.ensure_future(f())
28
28
29 """
29 """
30
30 from prompt_toolkit import __version__ as ptk_version
31 from prompt_toolkit import __version__ as ptk_version
31
32
32 from IPython.core.async_helpers import get_asyncio_loop
33 from IPython.core.async_helpers import get_asyncio_loop
@@ -3,7 +3,6 b''
3 This file is only meant to be imported by process.py, not by end-users.
3 This file is only meant to be imported by process.py, not by end-users.
4 """
4 """
5
5
6
7 from ._process_common import arg_split
6 from ._process_common import arg_split
8
7
9
8
@@ -96,58 +96,6 b' Documentation and installation instructions for older version of IPython can be'
96 found on the `IPython website <https://ipython.org/documentation.html>`_
96 found on the `IPython website <https://ipython.org/documentation.html>`_
97
97
98
98
99
100 IPython requires Python version 3 or above
101 ==========================================
102
103 Starting with version 6.0, IPython does not support Python 2.7, 3.0, 3.1, or
104 3.2.
105
106 For a version compatible with Python 2.7, please install the 5.x LTS Long Term
107 Support version.
108
109 If you are encountering this error message you are likely trying to install or
110 use IPython from source. You need to checkout the remote 5.x branch. If you are
111 using git the following should work::
112
113 $ git fetch origin
114 $ git checkout 5.x
115
116 If you encounter this error message with a regular install of IPython, then you
117 likely need to update your package manager, for example if you are using `pip`
118 check the version of pip with::
119
120 $ pip --version
121
122 You will need to update pip to the version 9.0.1 or greater. If you are not using
123 pip, please inquiry with the maintainers of the package for your package
124 manager.
125
126 For more information see one of our blog posts:
127
128 https://blog.jupyter.org/release-of-ipython-5-0-8ce60b8d2e8e
129
130 As well as the following Pull-Request for discussion:
131
132 https://github.com/ipython/ipython/pull/9900
133
134 This error does also occur if you are invoking ``setup.py`` directly – which you
135 should not – or are using ``easy_install`` If this is the case, use ``pip
136 install .`` instead of ``setup.py install`` , and ``pip install -e .`` instead
137 of ``setup.py develop`` If you are depending on IPython as a dependency you may
138 also want to have a conditional dependency on IPython depending on the Python
139 version::
140
141 install_req = ['ipython']
142 if sys.version_info[0] < 3 and 'bdist_wheel' not in sys.argv:
143 install_req.remove('ipython')
144 install_req.append('ipython<6')
145
146 setup(
147 ...
148 install_requires=install_req
149 )
150
151 Alternatives to IPython
99 Alternatives to IPython
152 =======================
100 =======================
153
101
General Comments 0
You need to be logged in to leave comments. Login now