##// END OF EJS Templates
Merge pull request #11937 from Carreau/nep29...
Matthias Bussonnier -
r25238:4619233e merge
parent child Browse files
Show More
@@ -9,7 +9,6 b' addons:'
9 9
10 10 python:
11 11 - 3.6
12 - 3.5
13 12
14 13 sudo: false
15 14
@@ -27,12 +27,13 b' import sys'
27 27 #-----------------------------------------------------------------------------
28 28
29 29 # Don't forget to also update setup.py when this changes!
30 if sys.version_info < (3, 5):
30 if sys.version_info < (3, 6):
31 31 raise ImportError(
32 32 """
33 IPython 7.0+ supports Python 3.5 and above.
33 IPython 7.10+ supports Python 3.6 and above.
34 34 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
35 35 Python 3.3 and 3.4 were supported up to IPython 6.x.
36 Python 3.5 was supported with IPython 7.0 to 7.9.
36 37
37 38 See IPython `README.rst` file for more information:
38 39
@@ -10,6 +10,10 b''
10 10 .. image:: https://www.codetriage.com/ipython/ipython/badges/users.svg
11 11 :target: https://www.codetriage.com/ipython/ipython/
12 12
13 .. image:: https://raster.shields.io/badge/Follows-NEP29-brightgreen.png
14 :target: https://numpy.org/neps/nep-0029-deprecation_policy.html
15
16
13 17 ===========================================
14 18 IPython: Productive Interactive Computing
15 19 ===========================================
@@ -23,6 +27,10 b' contribute to the project.'
23 27
24 28 **IPython versions and Python Support**
25 29
30 Starting with IPython 7.10, IPython follows `NEP 29 <https://numpy.org/neps/nep-0029-deprecation_policy.html>`_
31
32 **IPython 7.10+** requires Python version 3.6 and above.
33
26 34 **IPython 7.0** requires Python version 3.5 and above.
27 35
28 36 **IPython 6.x** requires Python version 3.3 and above.
@@ -26,7 +26,7 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 if sys.version_info < (3, 5):
29 if sys.version_info < (3, 6):
30 30 pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.'
31 31 try:
32 32 import pip
@@ -42,9 +42,10 b' if sys.version_info < (3, 5):'
42 42
43 43
44 44 error = """
45 IPython 7.0+ supports Python 3.5 and above.
45 IPython 7.10+ supports Python 3.6 and above, following NEP 29.
46 46 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
47 47 Python 3.3 and 3.4 were supported up to IPython 6.x.
48 Python 3.5 was supported with IPython 7.0 to 7.9.
48 49
49 50 See IPython `README.rst` file for more information:
50 51
@@ -175,7 +176,7 b' extras_require = dict('
175 176 parallel = ['ipyparallel'],
176 177 qtconsole = ['qtconsole'],
177 178 doc = ['Sphinx>=1.3'],
178 test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel', 'numpy'],
179 test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel', 'numpy>=1.14'],
179 180 terminal = [],
180 181 kernel = ['ipykernel'],
181 182 nbformat = ['nbformat'],
@@ -199,11 +200,9 b' install_requires = ['
199 200 # but requires pip >= 6. pip < 6 ignores these.
200 201
201 202 extras_require.update({
202 ':python_version == "3.4"': ['typing'],
203 203 ':sys_platform != "win32"': ['pexpect'],
204 204 ':sys_platform == "darwin"': ['appnope'],
205 205 ':sys_platform == "win32"': ['colorama'],
206 ':sys_platform == "win32" and python_version < "3.6"': ['win_unicode_console>=0.5'],
207 206 })
208 207 # FIXME: re-specify above platform dependencies for pip < 6
209 208 # These would result in non-portable bdists.
@@ -229,7 +228,7 b' for key, deps in extras_require.items():'
229 228 extras_require['all'] = everything
230 229
231 230 if 'setuptools' in sys.modules:
232 setuptools_extra_args['python_requires'] = '>=3.5'
231 setuptools_extra_args['python_requires'] = '>=3.6'
233 232 setuptools_extra_args['zip_safe'] = False
234 233 setuptools_extra_args['entry_points'] = {
235 234 'console_scripts': find_entry_points(),
General Comments 0
You need to be logged in to leave comments. Login now