##// END OF EJS Templates
More changes to indicate Python 3 requirement
Thomas Kluyver -
Show More
@@ -30,8 +30,8 b' import warnings'
30 30
31 31 # Don't forget to also update setup.py when this changes!
32 32 v = sys.version_info
33 if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,3)):
34 raise ImportError('IPython requires Python version 2.7 or 3.3 or above.')
33 if v[:2] < (3,3):
34 raise ImportError('IPython requires Python version 3.3 or above.')
35 35 del v
36 36
37 37 # Make it easy to import extensions - they are always directly on pythonpath.
@@ -22,8 +22,8 b' Welcome to IPython. Our full documentation is available on `ipython.readthedocs'
22 22 <https://ipython.readthedocs.io/en/stable/>`_ and contain information on how to install, use
23 23 contribute to the project.
24 24
25 Officially, IPython requires Python version 2.7, or 3.3 and above.
26 IPython 1.x is the last IPython version to support Python 2.6 and 3.2.
25 Officially, IPython requires Python version 3.3 and above.
26 IPython 5.x is the last IPython version to support Python 2.7.
27 27
28 28 The Notebook, Qt console and a number of other pieces are now parts of *Jupyter*.
29 29 See the `Jupyter installation docs <http://jupyter.readthedocs.io/en/latest/install.html>`__
@@ -4,7 +4,7 b' Installing IPython'
4 4 ==================
5 5
6 6
7 IPython requires Python 2.7 or ≥ 3.3.
7 IPython 6 requires Python ≥ 3.3. IPython 5.x can be installed on Python 2.
8 8
9 9
10 10 Quick Install
@@ -27,8 +27,8 b' import sys'
27 27 # This check is also made in IPython/__init__, don't forget to update both when
28 28 # changing Python version requirements.
29 29 v = sys.version_info
30 if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,3)):
31 error = "ERROR: IPython requires Python version 2.7 or 3.3 or above."
30 if v[:2] < (3,3):
31 error = "ERROR: IPython requires Python version 3.3 or above."
32 32 print(error, file=sys.stderr)
33 33 sys.exit(1)
34 34
@@ -239,6 +239,7 b' for key, deps in extras_require.items():'
239 239 extras_require['all'] = everything
240 240
241 241 if 'setuptools' in sys.modules:
242 setuptools_extra_args['python_requires'] = '>=3.3'
242 243 setuptools_extra_args['zip_safe'] = False
243 244 setuptools_extra_args['entry_points'] = {
244 245 'console_scripts': find_entry_points(),
@@ -21,8 +21,7 b" archive = '%s:%s' % (archive_user, archive_dir)"
21 21 sdists = './setup.py sdist --formats=gztar,zip'
22 22 # Binary dists
23 23 def buildwheels():
24 for py in ('2', '3'):
25 sh('python%s setupegg.py bdist_wheel' % py)
24 sh('python3 setupegg.py bdist_wheel' % py)
26 25
27 26 # Utility functions
28 27 def sh(cmd):
General Comments 0
You need to be logged in to leave comments. Login now